Started to work on icons
completing merge