swap_icon added
Merge remote-tracking branch 'origin/translator' into translator
Obsolete menu items removed