Merge branch 'release/1.8.3'
use yellow icon for settings as grey one is invisible with black themes
(e.g. Moonrise)
Merge remote-tracking branch 'origin/master' into develop