Fix icon placement

Fix needed for recently merged changes to upcoming 3.1RC3