Fix icon padding weirdness. Requires fix in core to be fully functional