Moved icons to proper place.
Removed the right side as it is not yet used.