fixed icon order
 more fixes