Merge "Fix incorrect icon alignment on shelf" into pi-dev