diff --git a/src/main/java/dev/dfonline/codeclient/dev/DevInventory/DevInventoryScreen.java b/src/main/java/dev/dfonline/codeclient/dev/DevInventory/DevInventoryScreen.java
index 11ec0698..4ad969f9 100644
--- a/src/main/java/dev/dfonline/codeclient/dev/DevInventory/DevInventoryScreen.java
+++ b/src/main/java/dev/dfonline/codeclient/dev/DevInventory/DevInventoryScreen.java
@@ -18,7 +18,6 @@
 import net.minecraft.client.gui.screen.ingame.InventoryScreen;
 import net.minecraft.client.gui.widget.TextFieldWidget;
 import net.minecraft.client.render.GameRenderer;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.entity.player.PlayerEntity;
 import net.minecraft.entity.player.PlayerInventory;
 import net.minecraft.inventory.SimpleInventory;
@@ -407,7 +406,7 @@ protected void renderTabIcon(DrawContext context, DevInventoryGroup group) {
         originX += 6;
         originY += 8 + (isTopRow ? 2 : -2);
         ItemStack itemStack = group.getIcon();
-        context.drawItemInSlot(textRenderer, itemStack, originX, originY);
+        context.drawItem(itemStack, originX, originY);
 //        this.itemRenderer.zOffset = 0.0F;
     }
     public boolean mouseScrolled(double mouseX, double mouseY, double amount) {
diff --git a/src/main/java/dev/dfonline/codeclient/mixin/render/hud/MItemRenderer.java b/src/main/java/dev/dfonline/codeclient/mixin/render/hud/MDrawContext.java
similarity index 93%
rename from src/main/java/dev/dfonline/codeclient/mixin/render/hud/MItemRenderer.java
rename to src/main/java/dev/dfonline/codeclient/mixin/render/hud/MDrawContext.java
index bd151351..3425b2d1 100644
--- a/src/main/java/dev/dfonline/codeclient/mixin/render/hud/MItemRenderer.java
+++ b/src/main/java/dev/dfonline/codeclient/mixin/render/hud/MDrawContext.java
@@ -5,7 +5,6 @@
 import dev.dfonline.codeclient.hypercube.item.Scope;
 import net.minecraft.client.font.TextRenderer;
 import net.minecraft.client.gui.DrawContext;
-import net.minecraft.client.render.item.ItemRenderer;
 import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
 import net.minecraft.nbt.NbtCompound;
@@ -19,7 +18,7 @@
 import org.spongepowered.asm.mixin.injection.callback.CallbackInfo;
 
 @Mixin(DrawContext.class)
-public abstract class MItemRenderer {
+public abstract class MDrawContext {
     @Shadow @Final private MatrixStack matrices;
 
     @Shadow public abstract int drawText(TextRenderer textRenderer, Text text, int x, int y, int color, boolean shadow);
@@ -39,7 +38,7 @@ private void additionalItemRendering(TextRenderer textRenderer, ItemStack stack,
 
         this.matrices.translate(0.0F, 0.0F, 200.0F);
         Scope scope = Scope.valueOf(scopeName);
-        this.drawText(textRenderer,Text.literal(scope.shortName).formatted(scope.color),x,y,0xFFFFFF,false);
+        this.drawText(textRenderer,Text.literal(scope.shortName).formatted(scope.color),x,y,0xFFFFFF,true);
         matrices.translate(0.0F, 0.0F, -200.0F);
     }
 }
diff --git a/src/main/java/dev/dfonline/codeclient/switcher/GenericSwitcher.java b/src/main/java/dev/dfonline/codeclient/switcher/GenericSwitcher.java
index 4f24f696..98ffacc3 100644
--- a/src/main/java/dev/dfonline/codeclient/switcher/GenericSwitcher.java
+++ b/src/main/java/dev/dfonline/codeclient/switcher/GenericSwitcher.java
@@ -8,7 +8,6 @@
 import net.minecraft.client.gui.screen.narration.NarrationMessageBuilder;
 import net.minecraft.client.gui.widget.ClickableWidget;
 import net.minecraft.client.util.InputUtil;
-import net.minecraft.client.util.math.MatrixStack;
 import net.minecraft.item.ItemStack;
 import net.minecraft.text.Text;
 import net.minecraft.util.Identifier;
@@ -23,7 +22,7 @@
  */
 public abstract class GenericSwitcher extends Screen {
     private static final Identifier TEXTURE = new Identifier("textures/gui/container/gamemode_switcher.png");
-    private List<SelectableButtonWidget> buttons = new ArrayList<>();
+    private final List<SelectableButtonWidget> buttons = new ArrayList<>();
     private boolean usingMouseToSelect = false;
     private Integer lastMouseX;
     private Integer lastMouseY;
@@ -115,6 +114,7 @@ public boolean keyPressed(int keyCode, int scanCode, int modifiers) {
     }
 
     private boolean checkFinished() {
+        if(this.client == null) return false;
         if(!InputUtil.isKeyPressed(this.client.getWindow().getHandle(), HOLD_KEY)) {
             Option selected = getSelected();
             if(selected != null) selected.run();
@@ -159,6 +159,7 @@ public void renderButton(DrawContext context, int mouseX, int mouseY, float delt
             context.drawTexture(TEXTURE,0, 0, 0.0F, 75.0F, 26, 26, 128, 128);
             context.getMatrices().pop();
 
+            context.drawItem(option.icon, this.getX() + 5, this.getY() + 5);
             context.drawItemInSlot(textRenderer, option.icon, this.getX() + 5, this.getY() + 5);
 
             if(selected) {
diff --git a/src/main/resources/CodeClient.mixins.json b/src/main/resources/CodeClient.mixins.json
index 366b240d..5b407e94 100644
--- a/src/main/resources/CodeClient.mixins.json
+++ b/src/main/resources/CodeClient.mixins.json
@@ -17,7 +17,7 @@
     "render.MDebugRenderer",
     "render.hud.MInGameHud",
     "render.hud.MInGameOverlayRenderer",
-    "render.hud.MItemRenderer",
+    "render.hud.MDrawContext",
     "render.hud.MTitleScreen",
     "world.ClientWorldAccessor",
     "world.MWorldRenderer",