diff --git a/assets/locales.json b/assets/locales.json
index 26057985c..e930c55c5 100644
--- a/assets/locales.json
+++ b/assets/locales.json
@@ -5425,26 +5425,26 @@
     {
       "ID": "SettingsTabGraphicsAPI",
       "Translations": {
-        "ar_SA": "API الرسومات ",
-        "de_DE": "Grafik-API",
-        "el_GR": "API Γραφικά",
-        "en_US": "Graphics API",
-        "es_ES": "API de gráficos",
-        "fr_FR": "API Graphique",
-        "he_IL": "ממשק גראפי",
-        "it_IT": "API grafica",
-        "ja_JP": "グラフィックスAPI",
-        "ko_KR": "그래픽 API",
-        "no_NO": "Grafikk API",
-        "pl_PL": "Graficzne API",
-        "pt_BR": "API gráfica",
-        "ru_RU": "Графические API",
-        "sv_SE": "Grafik-API",
-        "th_TH": "API กราฟฟิก",
-        "tr_TR": "Grafikler API",
-        "uk_UA": "Графічний API",
-        "zh_CN": "图形 API",
-        "zh_TW": "圖形 API"
+        "ar_SA": "API الرسومات و تحسين",
+        "de_DE": "Grafik-API & Optimierung",
+        "el_GR": "API Γραφικά & Βελτιστοποίηση",
+        "en_US": "Graphics API & Optimization",
+        "es_ES": "API de gráficos & Optimización",
+        "fr_FR": "API Graphique & Optimisation",
+        "he_IL": "ממשק גראפי & אופטימיזציה",
+        "it_IT": "API grafica & Ottimizzazione",
+        "ja_JP": "グラフィックスAPI＆最適化",
+        "ko_KR": "그래픽 API & 최적화",
+        "no_NO": "Grafikk-API & Optimalisering",
+        "pl_PL": "Graficzne API & Optymalizacja",
+        "pt_BR": "API gráfica & Otimização",
+        "ru_RU": "Графический API & Оптимизация",
+        "sv_SE": "Grafik-API & Optimering",
+        "th_TH": "API กราฟฟิก & การเพิ่มประสิทธิภาพ",
+        "tr_TR": "Grafikler API & Optimizasyon",
+        "uk_UA": "Графічний API & Оптимізація",
+        "zh_CN": "图形 API & 优化",
+        "zh_TW": "圖形 API & 優化"
       }
     },
     {
diff --git a/src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml b/src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml
index 219efcef8..5a91b0435 100644
--- a/src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml
+++ b/src/Ryujinx/UI/Views/Settings/SettingsGraphicsView.axaml
@@ -56,7 +56,27 @@
                                 SelectedIndex="{Binding PreferredGpuIndex}"
                                 ItemsSource="{Binding AvailableGpus}"/>
                     </StackPanel>
-                </StackPanel>
+                        <StackPanel Orientation="Horizontal">
+                            <TextBlock VerticalAlignment="Center"
+                                       ToolTip.Tip="{ext:Locale GraphicsBackendThreadingTooltip}"
+                                       Text="{ext:Locale SettingsTabGraphicsBackendMultithreading}"
+                                       Width="250" />
+                            <ComboBox Width="350"
+                                      HorizontalContentAlignment="Left"
+                                      ToolTip.Tip="{ext:Locale GalThreadingTooltip}"
+                                      SelectedIndex="{Binding GraphicsBackendMultithreadingIndex}">
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale CommonAuto}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale CommonOff}" />
+                                </ComboBoxItem>
+                                <ComboBoxItem>
+                                    <TextBlock Text="{ext:Locale CommonOn}" />
+                                </ComboBoxItem>
+                            </ComboBox>
+                        </StackPanel>
+                    </StackPanel>
                 <Separator Height="1" />
                 <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGraphicsFeatures}" />
                 <StackPanel Margin="10,0,0,0" Orientation="Vertical" Spacing="10">
@@ -255,32 +275,7 @@
                         </ComboBox>
                     </StackPanel>
                 </StackPanel>
-                <StackPanel
-                    Margin="10,0,0,0"
-                    HorizontalAlignment="Stretch"
-                    Orientation="Vertical"
-                    Spacing="10">
-                    <StackPanel Orientation="Horizontal">
-                        <TextBlock VerticalAlignment="Center"
-                                   ToolTip.Tip="{ext:Locale GraphicsBackendThreadingTooltip}"
-                                   Text="{ext:Locale SettingsTabGraphicsBackendMultithreading}"
-                                   Width="250" />
-                        <ComboBox Width="350"
-                                  HorizontalContentAlignment="Left"
-                                  ToolTip.Tip="{ext:Locale GalThreadingTooltip}"
-                                  SelectedIndex="{Binding GraphicsBackendMultithreadingIndex}">
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale CommonAuto}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale CommonOff}" />
-                            </ComboBoxItem>
-                            <ComboBoxItem>
-                                <TextBlock Text="{ext:Locale CommonOn}" />
-                            </ComboBoxItem>
-                        </ComboBox>
-                    </StackPanel>
-                </StackPanel>
+ 
                 <Separator Height="1" />
                 <TextBlock Classes="h1" Text="{ext:Locale SettingsTabGraphicsDeveloperOptions}" />
                 <StackPanel