Refactored icons to be used, removed unused
Added in menu items.