diff --git a/src/main/java/net/fabricmc/fabric/api/client/itemgroup/FabricItemGroupBuilder.java b/src/main/java/net/fabricmc/fabric/api/client/itemgroup/FabricItemGroupBuilder.java
index 01168e31c..5f8a9757a 100644
--- a/src/main/java/net/fabricmc/fabric/api/client/itemgroup/FabricItemGroupBuilder.java
+++ b/src/main/java/net/fabricmc/fabric/api/client/itemgroup/FabricItemGroupBuilder.java
@@ -91,7 +91,7 @@ public final class FabricItemGroupBuilder {
 	 */
 	public ItemGroup build() {
 		((ItemGroupExtensions) ItemGroup.BUILDING_BLOCKS).fabric_expandArray();
-		return new ItemGroup(ItemGroup.GROUPS.length - 1, identifier.toString()) {
+		return new ItemGroup(ItemGroup.GROUPS.length - 1, String.format("%s.%s", identifier.getNamespace(), identifier.getPath())) {
 			@Override
 			public ItemStack getIconItem() {
 				return stackSupplier.get();
diff --git a/src/main/java/net/fabricmc/fabric/client/itemgroup/FabricCreativeGuiComponents.java b/src/main/java/net/fabricmc/fabric/client/itemgroup/FabricCreativeGuiComponents.java
index f4af6bb9e..8cc26415e 100644
--- a/src/main/java/net/fabricmc/fabric/client/itemgroup/FabricCreativeGuiComponents.java
+++ b/src/main/java/net/fabricmc/fabric/client/itemgroup/FabricCreativeGuiComponents.java
@@ -66,6 +66,7 @@ public class FabricCreativeGuiComponents {
 			if (this.visible) {
 				MinecraftClient minecraftClient = MinecraftClient.getInstance();
 				minecraftClient.getTextureManager().bindTexture(BUTTON_TEX);
+				GlStateManager.disableLighting();
 				GlStateManager.color4f(1F, 1F, 1F, 1F);
 				this.drawTexturedRect(this.x, this.y, (type == Type.NEXT ? 12 : 0), (enabled ? 0 : 12), 12, 12);