Update and move icons to correct location