Re-organize menu items
Updated icons with new styles from René
Merge commit '0d539e3ef5b5821634dc6a377e05a1b82acfb435'
Fixed some whitespace