diff --git a/es-core/src/components/BadgeComponent.cpp b/es-core/src/components/BadgeComponent.cpp
index dcaeba4bb..630af083c 100644
--- a/es-core/src/components/BadgeComponent.cpp
+++ b/es-core/src/components/BadgeComponent.cpp
@@ -34,9 +34,12 @@ namespace
{"gamepad_nintendo_nes", "Gamepad (Nintendo NES)", ":/graphics/controllers/gamepad_nintendo_nes.svg"},
{"gamepad_nintendo_snes", "Gamepad (Nintendo SNES)", ":/graphics/controllers/gamepad_nintendo_snes.svg"},
{"gamepad_nintendo_64", "Gamepad (Nintendo 64)", ":/graphics/controllers/gamepad_nintendo_64.svg"},
+ {"gamepad_nintendo_gamecube", "Gamepad (Nintendo GameCube)", ":/graphics/controllers/gamepad_nintendo_gamecube.svg"},
{"gamepad_playstation", "Gamepad (PlayStation)", ":/graphics/controllers/gamepad_playstation.svg"},
+ {"gamepad_sega_master_system", "Gamepad (Sega Master System)", ":/graphics/controllers/gamepad_sega_master_system.svg"},
{"gamepad_sega_md_3_buttons", "Gamepad (Sega Mega Drive/Genesis 3 Buttons)", ":/graphics/controllers/gamepad_sega_md_3_buttons.svg"},
{"gamepad_sega_md_6_buttons", "Gamepad (Sega Mega Drive/Genesis 6 Buttons)", ":/graphics/controllers/gamepad_sega_md_6_buttons.svg"},
+ {"gamepad_sega_dreamcast", "Gamepad (Sega Dreamcast)", ":/graphics/controllers/gamepad_sega_dreamcast.svg"},
{"gamepad_xbox", "Gamepad (Xbox)", ":/graphics/controllers/gamepad_xbox.svg"},
{"joystick_generic", "Joystick (Generic)", ":/graphics/controllers/joystick_generic.svg"},
{"joystick_arcade_no_buttons", "Joystick (Arcade No Buttons)", ":/graphics/controllers/joystick_arcade_no_buttons.svg"},
diff --git a/resources/graphics/controllers/gamepad_nintendo_gamecube.svg b/resources/graphics/controllers/gamepad_nintendo_gamecube.svg
new file mode 100644
index 000000000..c0638ef90
--- /dev/null
+++ b/resources/graphics/controllers/gamepad_nintendo_gamecube.svg
@@ -0,0 +1,436 @@
+
+
+
+
diff --git a/resources/graphics/controllers/gamepad_sega_dreamcast.svg b/resources/graphics/controllers/gamepad_sega_dreamcast.svg
new file mode 100644
index 000000000..eeb41915b
--- /dev/null
+++ b/resources/graphics/controllers/gamepad_sega_dreamcast.svg
@@ -0,0 +1,454 @@
+
+
+
+
diff --git a/resources/graphics/controllers/gamepad_sega_master_system.svg b/resources/graphics/controllers/gamepad_sega_master_system.svg
new file mode 100644
index 000000000..8cef808df
--- /dev/null
+++ b/resources/graphics/controllers/gamepad_sega_master_system.svg
@@ -0,0 +1,361 @@
+
+
+
+
diff --git a/themes/slate-es-de/gc/images/controller.svg b/themes/slate-es-de/gc/images/controller.svg
index 57f8ff732..001a67129 100644
--- a/themes/slate-es-de/gc/images/controller.svg
+++ b/themes/slate-es-de/gc/images/controller.svg
@@ -1,344 +1,414 @@
-
-
-