remove unused icons
remove commented code
remove commented code part2
Merge branch 'new_icons' into testing