diff --git a/assets/Locales/Root.json b/assets/Locales/Root.json
index 7917fe417..7d0199fd3 100644
--- a/assets/Locales/Root.json
+++ b/assets/Locales/Root.json
@@ -1,4 +1,4 @@
-{
+{
   "Locales": [
     {
       "ID": "MenuBarActionsOpenMiiEditor",
@@ -6878,26 +6878,51 @@
     {
       "ID": "ControllerSettingsRefresh",
       "Translations": {
-        "ar_SA": "تحديث",
-        "de_DE": "Aktualisieren",
-        "el_GR": "Ανανέωση",
-        "en_US": "Refresh",
-        "es_ES": "Actualizar",
-        "fr_FR": "Actualiser",
-        "he_IL": "רענון",
-        "it_IT": "Ricarica",
-        "ja_JP": "更新",
-        "ko_KR": "새로 고침",
-        "no_NO": "Oppdater",
-        "pl_PL": "Odśwież",
-        "pt_BR": "Atualizar",
-        "ru_RU": "Обновить",
-        "sv_SE": "Uppdatera",
-        "th_TH": "รีเฟรช",
-        "tr_TR": "Yenile",
-        "uk_UA": "Оновити",
-        "zh_CN": "刷新",
-        "zh_TW": "重新整理"
+        "ar_SA": "تحديث أجهزة الإدخال",
+        "de_DE": "Eingabegeräte aktualisieren",
+        "el_GR": "Ανανέωση συσκευών εισόδου",
+        "en_US": "Refresh input devices",
+        "es_ES": "Actualizar dispositivos de entrada",
+        "fr_FR": "Actualiser les périphériques d'entrée",
+        "he_IL": "רענון התקני קלט",
+        "it_IT": "Aggiorna dispositivi di input",
+        "ja_JP": "入力デバイスを更新",
+        "ko_KR": "입력 장치 새로 고침",
+        "no_NO": "Oppdater inndataenheter",
+        "pl_PL": "Odśwież urządzenia wejściowe",
+        "pt_BR": "Atualizar dispositivos de entrada",
+        "ru_RU": "Обновить устройства ввода",
+        "sv_SE": "Uppdatera inmatningsenheter",
+        "th_TH": "รีเฟรชอุปกรณ์ป้อนข้อมูล",
+        "tr_TR": "Giriş cihazlarını yenile",
+        "uk_UA": "Оновити пристрої введення",
+        "zh_CN": "刷新输入设备",
+        "zh_TW": "重新整理輸入裝置"
+      }
+    },
+    {
+      "ID": "ControllerSettingsResetKeybindsToDefault",
+      "Translations": {
+        "ar_SA": "",
+        "de_DE": "",
+        "el_GR": "",
+        "en_US": "Reset keybinds to default",
+        "es_ES": "Restablecer asignaciones por defecto",
+        "fr_FR": "Réinitialiser les assignations par défaut",
+        "he_IL": "",
+        "it_IT": "",
+        "ja_JP": "",
+        "ko_KR": "",
+        "no_NO": "",
+        "pl_PL": "",
+        "pt_BR": "",
+        "ru_RU": "",
+        "sv_SE": "",
+        "th_TH": "",
+        "tr_TR": "",
+        "uk_UA": "",
+        "zh_CN": "",
+        "zh_TW": ""
       }
     },
     {
@@ -22976,4 +23001,6 @@
       }
     }
   ]
-}
\ No newline at end of file
+}
+
+
diff --git a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
index 827ec128c..76caf6b93 100644
--- a/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
+++ b/src/Ryujinx/UI/ViewModels/Input/InputViewModel.cs
@@ -304,6 +304,11 @@ namespace Ryujinx.Ava.UI.ViewModels.Input
             NotifyChanges();
         }
 
+        public void RefreshInputDevices()
+        {
+            RefreshAvailableDevices();
+        }
+
         public object SelectedDeviceItem
         {
             get => _device >= 0 && _device < Devices.Count ? Devices[_device] : null;
diff --git a/src/Ryujinx/UI/Views/Input/InputView.axaml b/src/Ryujinx/UI/Views/Input/InputView.axaml
index b58fcb697..9295e0c38 100644
--- a/src/Ryujinx/UI/Views/Input/InputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/InputView.axaml
@@ -149,7 +149,7 @@
                 <Grid
                     Grid.Column="0"
                     Margin="2"
-                    HorizontalAlignment="Stretch" ColumnDefinitions="Auto,*,Auto">
+                    HorizontalAlignment="Stretch" ColumnDefinitions="Auto,*,Auto,Auto">
                     <TextBlock
                         Grid.Column="0"
                         Margin="5,0,10,0"
@@ -175,12 +175,25 @@
                         MinWidth="0"
                         Margin="5,0,0,0"
                         VerticalAlignment="Center"
-                        Command="{Binding ResetCurrentDeviceToDefaults}">
+                        ToolTip.Tip="{ext:Locale ControllerSettingsRefresh}"
+                        Command="{Binding RefreshInputDevices}">
                         <ui:SymbolIcon
                             Symbol="Refresh"
                             FontSize="15"
                             Height="20"/>
                     </Button>
+                    <Button
+                        Grid.Column="3"
+                        MinWidth="0"
+                        Margin="5,0,0,0"
+                        VerticalAlignment="Center"
+                        ToolTip.Tip="{ext:Locale ControllerSettingsResetKeybindsToDefault}"
+                        Command="{Binding ResetCurrentDeviceToDefaults}">
+                        <ui:SymbolIcon
+                            Symbol="Undo"
+                            FontSize="15"
+                            Height="20"/>
+                    </Button>
                 </Grid>
                 <!-- Controller Type -->
                 <Grid