Another bunch od workaround fixes for custom icon types