Settings/toolbar: derp in show/hide feature
Merge remote-tracking branch 'settingsPA/jb43' into jb43