diff --git a/src/item_icon.c b/src/item_icon.c
index 45775f6674..627b7894d5 100644
--- a/src/item_icon.c
+++ b/src/item_icon.c
@@ -162,15 +162,16 @@ u8 AddCustomItemIconSprite(const struct SpriteTemplate *customSpriteTemplate, u1
 const void *GetItemIconPicOrPalette(u16 itemId, u8 which)
 {
     if (itemId == ITEM_LIST_END)
-        itemId = ITEMS_COUNT; // Use last icon, the "return to field" arrow
-    else if (itemId >= ITEMS_COUNT)
-        itemId = 0;
-    else if (itemId >= ITEM_TM01 && itemId <= ITEM_HM08 && which)
-        return gTypesInfo[gMovesInfo[gItemsInfo[itemId].secondaryId].type].paletteTMHM;
-    else if (itemId >= ITEM_TM01 && itemId < ITEM_HM01)
-        return gItemIcon_TM;
-    else if (itemId >= ITEM_HM01 && itemId <= ITEM_HM08)
+        return gItemIconTable[ITEMS_COUNT][which]; // Use last icon, the "return to field" arrow
+    if (itemId >= ITEMS_COUNT)
+        return gItemIconTable[0][which];
+    if (itemId >= ITEM_TM01 && itemId < ITEM_HM01 + NUM_HIDDEN_MACHINES)
+    {
+        if (which)
+            return gTypesInfo[gMovesInfo[gItemsInfo[itemId].secondaryId].type].paletteTMHM;
+        if (itemId < ITEM_TM01 + NUM_TECHNICAL_MACHINES)
+            return gItemIcon_TM;
         return gItemIcon_HM;
-
+    }
     return gItemIconTable[itemId][which];
 }