* Changed some colors
* Fixed icons
Merge branch 'ui_fix' into dev