WindowShopper:
refactorin part 2
 - icon names changed
 - unnecessary icons removed
 - unnecessary views removed
 - view ids fixed
 - small code updates