Toolbar CSS optimization; User preferences view;
Merge branch 'develop' into is-deleted