diff --git a/assets/locales.json b/assets/locales.json
index 7863303b5..9c4254beb 100644
--- a/assets/locales.json
+++ b/assets/locales.json
@@ -7243,7 +7243,7 @@
       }
     },
     {
-      "ID": "ControllerSettingsDPadUp",
+      "ID": "ControllerSettingsUp",
       "Translations": {
         "ar_SA": "اعلى",
         "de_DE": "Hoch",
@@ -7254,7 +7254,7 @@
         "he_IL": "מעלה",
         "it_IT": "Su",
         "ja_JP": "上",
-        "ko_KR": "↑",
+        "ko_KR": "위",
         "no_NO": "Opp",
         "pl_PL": "Góra",
         "pt_BR": "Cima",
@@ -7268,7 +7268,7 @@
       }
     },
     {
-      "ID": "ControllerSettingsDPadDown",
+      "ID": "ControllerSettingsDown",
       "Translations": {
         "ar_SA": "أسفل",
         "de_DE": "Runter",
@@ -7279,7 +7279,7 @@
         "he_IL": "מטה",
         "it_IT": "Giù",
         "ja_JP": "下",
-        "ko_KR": "↓",
+        "ko_KR": "아래",
         "no_NO": "Ned",
         "pl_PL": "Dół",
         "pt_BR": "Baixo",
@@ -7293,7 +7293,7 @@
       }
     },
     {
-      "ID": "ControllerSettingsDPadLeft",
+      "ID": "ControllerSettingsLeft",
       "Translations": {
         "ar_SA": "يسار",
         "de_DE": "Links",
@@ -7304,7 +7304,7 @@
         "he_IL": "שמאלה",
         "it_IT": "Sinistra",
         "ja_JP": "左",
-        "ko_KR": "←",
+        "ko_KR": "왼쪽",
         "no_NO": "Venstre",
         "pl_PL": "Lewo",
         "pt_BR": "Esquerda",
@@ -7318,7 +7318,7 @@
       }
     },
     {
-      "ID": "ControllerSettingsDPadRight",
+      "ID": "ControllerSettingsRight",
       "Translations": {
         "ar_SA": "يمين",
         "de_DE": "Rechts",
@@ -7329,7 +7329,7 @@
         "he_IL": "ימינה",
         "it_IT": "Destra",
         "ja_JP": "右",
-        "ko_KR": "→",
+        "ko_KR": "오른쪽",
         "no_NO": "Høyre",
         "pl_PL": "Prawo",
         "pt_BR": "Direita",
@@ -7367,106 +7367,6 @@
         "zh_TW": "按下 ⌾"
       }
     },
-    {
-      "ID": "ControllerSettingsStickUp",
-      "Translations": {
-        "ar_SA": "فوق",
-        "de_DE": "Hoch",
-        "el_GR": "Πάνω",
-        "en_US": "Up",
-        "es_ES": "Arriba",
-        "fr_FR": "Haut",
-        "he_IL": "למעלה",
-        "it_IT": "Su",
-        "ja_JP": "上",
-        "ko_KR": "↑",
-        "no_NO": "Opp",
-        "pl_PL": "Góra ",
-        "pt_BR": "Cima",
-        "ru_RU": "Вверх",
-        "sv_SE": "Upp",
-        "th_TH": "ขึ้น",
-        "tr_TR": "Yukarı",
-        "uk_UA": "Уверх",
-        "zh_CN": "上",
-        "zh_TW": "上"
-      }
-    },
-    {
-      "ID": "ControllerSettingsStickDown",
-      "Translations": {
-        "ar_SA": "أسفل",
-        "de_DE": "Runter",
-        "el_GR": "Κάτω",
-        "en_US": "Down",
-        "es_ES": "Abajo",
-        "fr_FR": "Bas",
-        "he_IL": "למטה",
-        "it_IT": "Giù",
-        "ja_JP": "下",
-        "ko_KR": "↓",
-        "no_NO": "Ned",
-        "pl_PL": "Dół ",
-        "pt_BR": "Baixo",
-        "ru_RU": "Вниз",
-        "sv_SE": "Ner",
-        "th_TH": "ลง",
-        "tr_TR": "Aşağı",
-        "uk_UA": "Униз",
-        "zh_CN": "下",
-        "zh_TW": "下"
-      }
-    },
-    {
-      "ID": "ControllerSettingsStickLeft",
-      "Translations": {
-        "ar_SA": "يسار",
-        "de_DE": "Links",
-        "el_GR": "Αριστερά",
-        "en_US": "Left",
-        "es_ES": "Izquierda",
-        "fr_FR": "Gauche",
-        "he_IL": "שמאלה",
-        "it_IT": "Sinistra",
-        "ja_JP": "左",
-        "ko_KR": "←",
-        "no_NO": "Venstre",
-        "pl_PL": "Lewo",
-        "pt_BR": "Esquerda",
-        "ru_RU": "Влево",
-        "sv_SE": "Vänster",
-        "th_TH": "ซ้าย",
-        "tr_TR": "Sol",
-        "uk_UA": "Ліворуч",
-        "zh_CN": "左",
-        "zh_TW": "左"
-      }
-    },
-    {
-      "ID": "ControllerSettingsStickRight",
-      "Translations": {
-        "ar_SA": "يمين",
-        "de_DE": "Rechts",
-        "el_GR": "Δεξιά",
-        "en_US": "Right",
-        "es_ES": "Derecha",
-        "fr_FR": "Droite",
-        "he_IL": "ימינה",
-        "it_IT": "Destra",
-        "ja_JP": "右",
-        "ko_KR": "→",
-        "no_NO": "Høyre",
-        "pl_PL": "Prawo",
-        "pt_BR": "Direita",
-        "ru_RU": "Вправо",
-        "sv_SE": "Höger",
-        "th_TH": "ขวา",
-        "tr_TR": "Sağ",
-        "uk_UA": "Праворуч",
-        "zh_CN": "右",
-        "zh_TW": "右"
-      }
-    },
     {
       "ID": "ControllerSettingsStickStick",
       "Translations": {
diff --git a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
index 6d0b2d62d..86a3589c8 100644
--- a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
@@ -240,7 +240,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{ext:Locale ControllerSettingsDPadUp}"
+                                    Text="{ext:Locale ControllerSettingsUp}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadUp">
                                     <TextBlock
@@ -257,7 +257,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{ext:Locale ControllerSettingsDPadDown}"
+                                    Text="{ext:Locale ControllerSettingsDown}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadDown">
                                     <TextBlock
@@ -274,7 +274,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{ext:Locale ControllerSettingsDPadLeft}"
+                                    Text="{ext:Locale ControllerSettingsLeft}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadLeft">
                                     <TextBlock
@@ -291,7 +291,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{ext:Locale ControllerSettingsDPadRight}"
+                                    Text="{ext:Locale ControllerSettingsRight}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadRight">
                                     <TextBlock
diff --git a/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml b/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml
index 02180fd14..1b5a03fbd 100644
--- a/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/KeyboardInputView.axaml
@@ -140,7 +140,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{ext:Locale ControllerSettingsStickUp}"
+                                    Text="{ext:Locale ControllerSettingsUp}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftStickUp">
                                     <TextBlock
@@ -157,7 +157,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{ext:Locale ControllerSettingsStickDown}"
+                                    Text="{ext:Locale ControllerSettingsDown}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftStickDown">
                                     <TextBlock
@@ -174,7 +174,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{ext:Locale ControllerSettingsStickLeft}"
+                                    Text="{ext:Locale ControllerSettingsLeft}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftStickLeft">
                                     <TextBlock
@@ -191,7 +191,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{ext:Locale ControllerSettingsStickRight}"
+                                    Text="{ext:Locale ControllerSettingsRight}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="LeftStickRight">
                                     <TextBlock
@@ -227,7 +227,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{ext:Locale ControllerSettingsDPadUp}"
+                                    Text="{ext:Locale ControllerSettingsUp}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadUp">
                                     <TextBlock
@@ -244,7 +244,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{ext:Locale ControllerSettingsDPadDown}"
+                                    Text="{ext:Locale ControllerSettingsDown}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadDown">
                                     <TextBlock
@@ -261,7 +261,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{ext:Locale ControllerSettingsDPadLeft}"
+                                    Text="{ext:Locale ControllerSettingsLeft}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadLeft">
                                     <TextBlock
@@ -278,7 +278,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{ext:Locale ControllerSettingsDPadRight}"
+                                    Text="{ext:Locale ControllerSettingsRight}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="DpadRight">
                                     <TextBlock
@@ -654,7 +654,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{ext:Locale ControllerSettingsStickUp}"
+                                    Text="{ext:Locale ControllerSettingsUp}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightStickUp">
                                     <TextBlock
@@ -671,7 +671,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{ext:Locale ControllerSettingsStickDown}"
+                                    Text="{ext:Locale ControllerSettingsDown}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightStickDown">
                                     <TextBlock
@@ -688,7 +688,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{ext:Locale ControllerSettingsStickLeft}"
+                                    Text="{ext:Locale ControllerSettingsLeft}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightStickLeft">
                                     <TextBlock
@@ -705,7 +705,7 @@
                                     Width="120"
                                     HorizontalAlignment="Center"
                                     VerticalAlignment="Center"
-                                    Text="{ext:Locale ControllerSettingsStickRight}"
+                                    Text="{ext:Locale ControllerSettingsRight}"
                                     TextAlignment="Center" />
                                 <ToggleButton Name="RightStickRight">
                                     <TextBlock