Stashing fixes here for icon alignment