Merge "Settings: TTS: Adding an icon to each button" into main