Ctrl-icons 16x16 for controller-part of the toolbar.
Merge branch 'master' of https://github.com/CasparCG/Client