diff --git a/desktop_version/fonts/buttons_10x10.fontmeta b/desktop_version/fonts/buttons_10x10.fontmeta
index a237c1fe..7dde371c 100644
--- a/desktop_version/fonts/buttons_10x10.fontmeta
+++ b/desktop_version/fonts/buttons_10x10.fontmeta
@@ -5,9 +5,9 @@
     <height>10</height>
     <white_teeth>1</white_teeth>
     <chars>
-        <range start="0xEB00" end="0xEB2F"/>
+        <range start="0xEB00" end="0xEB36"/>
     </chars>
     <special>
-        <range start="0xEB00" end="0xEB2F" color="1"/>
+        <range start="0xEB00" end="0xEB36" color="1"/>
     </special>
 </font_metadata>
diff --git a/desktop_version/fonts/buttons_10x10.png b/desktop_version/fonts/buttons_10x10.png
index b74f46d7..4df5284d 100644
Binary files a/desktop_version/fonts/buttons_10x10.png and b/desktop_version/fonts/buttons_10x10.png differ
diff --git a/desktop_version/fonts/buttons_12x12.fontmeta b/desktop_version/fonts/buttons_12x12.fontmeta
index 84eb6142..ccfe3f0a 100644
--- a/desktop_version/fonts/buttons_12x12.fontmeta
+++ b/desktop_version/fonts/buttons_12x12.fontmeta
@@ -5,9 +5,9 @@
     <height>12</height>
     <white_teeth>1</white_teeth>
     <chars>
-        <range start="0xEB00" end="0xEB2F"/>
+        <range start="0xEB00" end="0xEB36"/>
     </chars>
     <special>
-        <range start="0xEB00" end="0xEB2F" color="1"/>
+        <range start="0xEB00" end="0xEB36" color="1"/>
     </special>
 </font_metadata>
diff --git a/desktop_version/fonts/buttons_12x12.png b/desktop_version/fonts/buttons_12x12.png
index 3adf9c16..f2184484 100644
Binary files a/desktop_version/fonts/buttons_12x12.png and b/desktop_version/fonts/buttons_12x12.png differ
diff --git a/desktop_version/fonts/buttons_8x8.fontmeta b/desktop_version/fonts/buttons_8x8.fontmeta
index 9daa90b3..60e2e566 100644
--- a/desktop_version/fonts/buttons_8x8.fontmeta
+++ b/desktop_version/fonts/buttons_8x8.fontmeta
@@ -5,9 +5,9 @@
     <height>8</height>
     <white_teeth>1</white_teeth>
     <chars>
-        <range start="0xEB00" end="0xEB2F"/>
+        <range start="0xEB00" end="0xEB36"/>
     </chars>
     <special>
-        <range start="0xEB00" end="0xEB2F" color="1"/>
+        <range start="0xEB00" end="0xEB36" color="1"/>
     </special>
 </font_metadata>
diff --git a/desktop_version/fonts/buttons_8x8.png b/desktop_version/fonts/buttons_8x8.png
index da8f4ccc..a3750e41 100644
Binary files a/desktop_version/fonts/buttons_8x8.png and b/desktop_version/fonts/buttons_8x8.png differ
diff --git a/desktop_version/src/ButtonGlyphs.cpp b/desktop_version/src/ButtonGlyphs.cpp
index a372c0ed..53171708 100644
--- a/desktop_version/src/ButtonGlyphs.cpp
+++ b/desktop_version/src/ButtonGlyphs.cpp
@@ -62,6 +62,15 @@ typedef enum
     GLYPH_NINTENDO_GENERIC_STICK,
     GLYPH_UNKNOWN,
 
+    /* Added after 2.4 */
+    GLYPH_NINTENDO_GAMECUBE_A,
+    GLYPH_NINTENDO_GAMECUBE_B,
+    GLYPH_NINTENDO_GAMECUBE_X,
+    GLYPH_NINTENDO_GAMECUBE_Y,
+    GLYPH_NINTENDO_GAMECUBE_L,
+    GLYPH_NINTENDO_GAMECUBE_R,
+    GLYPH_NINTENDO_GAMECUBE_Z,
+
     GLYPH_TOTAL
 }
 ButtonGlyphKey;
@@ -78,6 +87,9 @@ typedef enum
     LAYOUT_XBOX,
     LAYOUT_GENERIC,
 
+    /* Added after 2.4 */
+    LAYOUT_GAMECUBE,
+
     LAYOUT_TOTAL
 }
 ButtonGlyphLayout;
@@ -133,6 +145,13 @@ static const char* glyph_layout[LAYOUT_TOTAL][SDL_CONTROLLER_BUTTON_RIGHTSHOULDE
         "SELECT", "GUIDE", "START",
         glyph[GLYPH_NINTENDO_XBOX_LSTICK], glyph[GLYPH_NINTENDO_XBOX_RSTICK],
         glyph[GLYPH_GENERIC_L], glyph[GLYPH_GENERIC_R]
+    },
+    { // GAMECUBE
+        glyph[GLYPH_NINTENDO_GAMECUBE_A], glyph[GLYPH_NINTENDO_GAMECUBE_X],
+        glyph[GLYPH_NINTENDO_GAMECUBE_B], glyph[GLYPH_NINTENDO_GAMECUBE_Y],
+        glyph[GLYPH_UNKNOWN], glyph[GLYPH_UNKNOWN], "START",
+        glyph[GLYPH_UNKNOWN], glyph[GLYPH_UNKNOWN],
+        glyph[GLYPH_UNKNOWN], glyph[GLYPH_NINTENDO_GAMECUBE_Z]
     }
 };
 
@@ -215,8 +234,7 @@ void BUTTONGLYPHS_update_layout(SDL_GameController *c)
         }
         else if (product == 0x0337)
         {
-            /* FIXME: GameCube glyphs? -flibit */
-            layout = LAYOUT_XBOX;
+            layout = LAYOUT_GAMECUBE;
         }
         else
         {