diff --git a/desktop_version/fonts/buttons_10x10.fontmeta b/desktop_version/fonts/buttons_10x10.fontmeta
index 7dde371c..53bddfe1 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="0xEB36"/>
+        <range start="0xEB00" end="0xEB3C"/>
     </chars>
     <special>
-        <range start="0xEB00" end="0xEB36" color="1"/>
+        <range start="0xEB00" end="0xEB3C" color="1"/>
     </special>
 </font_metadata>
diff --git a/desktop_version/fonts/buttons_10x10.png b/desktop_version/fonts/buttons_10x10.png
index 4df5284d..7005c75b 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 ccfe3f0a..92a89ec5 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="0xEB36"/>
+        <range start="0xEB00" end="0xEB3C"/>
     </chars>
     <special>
-        <range start="0xEB00" end="0xEB36" color="1"/>
+        <range start="0xEB00" end="0xEB3C" color="1"/>
     </special>
 </font_metadata>
diff --git a/desktop_version/fonts/buttons_12x12.png b/desktop_version/fonts/buttons_12x12.png
index f2184484..4f305ada 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 60e2e566..8c174d60 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="0xEB36"/>
+        <range start="0xEB00" end="0xEB3C"/>
     </chars>
     <special>
-        <range start="0xEB00" end="0xEB36" color="1"/>
+        <range start="0xEB00" end="0xEB3C" color="1"/>
     </special>
 </font_metadata>
diff --git a/desktop_version/fonts/buttons_8x8.png b/desktop_version/fonts/buttons_8x8.png
index a3750e41..c7a47b9f 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 53171708..9ef5b27c 100644
--- a/desktop_version/src/ButtonGlyphs.cpp
+++ b/desktop_version/src/ButtonGlyphs.cpp
@@ -71,6 +71,13 @@ typedef enum
     GLYPH_NINTENDO_GAMECUBE_R,
     GLYPH_NINTENDO_GAMECUBE_Z,
 
+    GLYPH_NINTENDO_WII_A,
+    GLYPH_NINTENDO_WII_B,
+    GLYPH_NINTENDO_WII_1,
+    GLYPH_NINTENDO_WII_2,
+    GLYPH_NINTENDO_WII_MINUS,
+    GLYPH_NINTENDO_WII_PLUS,
+
     GLYPH_TOTAL
 }
 ButtonGlyphKey;
@@ -89,6 +96,8 @@ typedef enum
 
     /* Added after 2.4 */
     LAYOUT_GAMECUBE,
+    LAYOUT_WIIMOTE_ON_WII,
+    LAYOUT_WIIMOTE_ON_PC,
 
     LAYOUT_TOTAL
 }
@@ -152,7 +161,21 @@ static const char* glyph_layout[LAYOUT_TOTAL][SDL_CONTROLLER_BUTTON_RIGHTSHOULDE
         glyph[GLYPH_UNKNOWN], glyph[GLYPH_UNKNOWN], "START",
         glyph[GLYPH_UNKNOWN], glyph[GLYPH_UNKNOWN],
         glyph[GLYPH_UNKNOWN], glyph[GLYPH_NINTENDO_GAMECUBE_Z]
-    }
+    },
+    { // WIIMOTE on WII
+        glyph[GLYPH_NINTENDO_WII_1], glyph[GLYPH_NINTENDO_WII_2],
+        glyph[GLYPH_NINTENDO_WII_A], glyph[GLYPH_NINTENDO_WII_B],
+        "HOME", glyph[GLYPH_NINTENDO_WII_MINUS], glyph[GLYPH_NINTENDO_WII_PLUS],
+        glyph[GLYPH_UNKNOWN], glyph[GLYPH_UNKNOWN],
+        glyph[GLYPH_UNKNOWN], glyph[GLYPH_UNKNOWN]
+    },
+    { // WIIMOTE on PC
+        glyph[GLYPH_NINTENDO_WII_A], glyph[GLYPH_NINTENDO_WII_B],
+        glyph[GLYPH_NINTENDO_WII_1], glyph[GLYPH_NINTENDO_WII_2],
+        "HOME", glyph[GLYPH_NINTENDO_WII_MINUS], glyph[GLYPH_NINTENDO_WII_PLUS],
+        glyph[GLYPH_UNKNOWN], glyph[GLYPH_UNKNOWN],
+        glyph[GLYPH_UNKNOWN], glyph[GLYPH_UNKNOWN]
+    },
 };
 
 static bool keyboard_is_active = true;
@@ -232,10 +255,19 @@ void BUTTONGLYPHS_update_layout(SDL_GameController *c)
         {
             layout = LAYOUT_NINTENDO_SWITCH_JOYCON_R;
         }
-        else if (product == 0x0337)
+        else if (product == 0x0337 ||
+                 product == 0x0100)  // First GC controller on a Wii or Gamecube
         {
             layout = LAYOUT_GAMECUBE;
         }
+        else if (product == 0x0306)
+        {
+            layout = LAYOUT_WIIMOTE_ON_PC;
+        }
+        else if (product == 0x0501)   // First wiimote on Wii
+        {
+            layout = LAYOUT_WIIMOTE_ON_WII;
+        }
         else
         {
             layout = LAYOUT_NINTENDO_SWITCH_PRO;