Add proper icons and change order