Cherrypick from 2.1 SettingsWidget
dev: minor fixes to settingswidget