Apply more icon placement fixes