update icons and their names
Resolving conflicts
Visual improvements and client feedbac
Added some final fine touches
Latest icons and minified CSS
Merge branch 'develop' into master with latest updates
Fixing theming issues
Latest icons
Merge branch 'feature/29' into develop
Merge branch 'develop'