Merge changes Ibab0f9de,I4ab669ac into main

* changes:
  Toggle modes when pressing tile
  Add modes tiles to dialog