diff --git a/menu/drivers/xmb.c b/menu/drivers/xmb.c
index 60b975d9b2..a02263f33a 100644
--- a/menu/drivers/xmb.c
+++ b/menu/drivers/xmb.c
@@ -1432,7 +1432,31 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
       xmb_node_t *core_node, xmb_node_t *node, 
       uint32_t hash, unsigned type, bool active)
 {
-   uintptr_t id = 0;
+   switch (hash)
+   {
+      case MENU_LABEL_CORE_OPTIONS:
+         return xmb->textures.list[XMB_TEXTURE_CORE_OPTIONS];
+      case MENU_LABEL_CORE_INPUT_REMAPPING_OPTIONS:
+         return xmb->textures.list[XMB_TEXTURE_INPUT_REMAPPING_OPTIONS];
+      case MENU_LABEL_CORE_CHEAT_OPTIONS:
+         return xmb->textures.list[XMB_TEXTURE_CHEAT_OPTIONS];
+      case MENU_LABEL_DISK_OPTIONS:
+         return xmb->textures.list[XMB_TEXTURE_DISK_OPTIONS];
+      case MENU_LABEL_SHADER_OPTIONS:
+         return xmb->textures.list[XMB_TEXTURE_SHADER_OPTIONS];
+      case MENU_LABEL_ACHIEVEMENT_LIST:
+         return xmb->textures.list[XMB_TEXTURE_ACHIEVEMENT_LIST];
+      case MENU_LABEL_SAVESTATE:
+         return xmb->textures.list[XMB_TEXTURE_SAVESTATE];
+      case MENU_LABEL_LOADSTATE:
+         return xmb->textures.list[XMB_TEXTURE_LOADSTATE];
+      case MENU_LABEL_TAKE_SCREENSHOT:
+         return xmb->textures.list[XMB_TEXTURE_SCREENSHOT];
+      case MENU_LABEL_RESTART_CONTENT:
+         return xmb->textures.list[XMB_TEXTURE_RELOAD];
+      case MENU_LABEL_RESUME_CONTENT:
+         return xmb->textures.list[XMB_TEXTURE_RESUME];
+   }
 
    switch(type)
    {
@@ -1494,9 +1518,7 @@ static uintptr_t xmb_icon_get_id(xmb_handle_t *xmb,
          return xmb->textures.list[XMB_TEXTURE_CORE_INFO];
    }
 
-   id = xmb->textures.list[XMB_TEXTURE_SUBSETTING];
-
-   return id;
+   return xmb->textures.list[XMB_TEXTURE_SUBSETTING];
 }
 
 static void xmb_draw_items(xmb_handle_t *xmb,