Merge pull request #66 from alexmarsev/shaders

Redesign shaders
Update toolbar selection in dockzone calculation

Fixes #3804