Secondary toolbar
Merge pull request #2792 from timvandermeij/settings-bar

Secondary toolbar