removed unused class
fixed warnings
- renamed views
- added missing default icons
Merge commit 'cf9674f2e030c9a99b92136ecadad524312b5422' into develop