Rename icons
Remove unused icons
Fix positions