Merge "Add ability to toggle themed icons (1/3)" into main