diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse_Left.png b/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse1.png
similarity index 100%
rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse_Left.png
rename to Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse1.png
diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse_Right.png b/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse2.png
similarity index 100%
rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse_Right.png
rename to Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse2.png
diff --git a/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse_Middle.png b/Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse3.png
similarity index 100%
rename from Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse_Middle.png
rename to Templates/BaseGame/game/data/ui/images/Inputs/Keyboard & Mouse/Keyboard_Black_Mouse3.png
diff --git a/Templates/BaseGame/game/data/ui/scripts/controlsMenu.cs b/Templates/BaseGame/game/data/ui/scripts/controlsMenu.cs
index 48c4f6e59..071902d99 100644
--- a/Templates/BaseGame/game/data/ui/scripts/controlsMenu.cs
+++ b/Templates/BaseGame/game/data/ui/scripts/controlsMenu.cs
@@ -114,6 +114,9 @@ function buildFullMapString( %index, %actionMap, %deviceType )
       %device = getField( %temp, %i + 0 );
       %object = getField( %temp, %i + 1 );
       
+      if (startsWith(%device,"mouse"))
+          %deviceType = "mouse";
+      
       if(%deviceType !$= "" && !startsWith(%device, %deviceType))
          continue;