diff --git a/src/Ryujinx/UI/Views/Input/LedInputView.axaml b/src/Ryujinx/UI/Views/Input/LedInputView.axaml
index e27ab785b..1b0de4ebc 100644
--- a/src/Ryujinx/UI/Views/Input/LedInputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/LedInputView.axaml
@@ -9,30 +9,30 @@
              mc:Ignorable="d" d:DesignWidth="800" d:DesignHeight="450"
              x:DataType="viewModels:LedInputViewModel"
              x:Class="Ryujinx.UI.Views.Input.LedInputView">
-    <Grid Margin="10" HorizontalAlignment="Center" RowDefinitions="Auto,Auto,Auto,Auto" ColumnDefinitions="Auto,Auto">
-        <CheckBox Grid.Row="0" Margin="0,0,0,2.5" IsChecked="{Binding TurnOffLed, Mode=TwoWay}"
-                Command="{Binding LedDisabledChanged}" IsVisible="{Binding ParentModel.CanClearLed}">
+    <StackPanel Margin="10" HorizontalAlignment="Center">
+        <CheckBox Margin="0,0,0,2.5" IsChecked="{Binding TurnOffLed, Mode=TwoWay}"
+                  Command="{Binding LedDisabledChanged}" IsVisible="{Binding ParentModel.CanClearLed}">
             <TextBlock Text="{ext:Locale ControllerSettingsLedColorDisable}" />
         </CheckBox>
-        <CheckBox Grid.Row="1" Margin="0,0,0,2.5" IsChecked="{Binding UseRainbowLed, Mode=TwoWay}">
+        <CheckBox Margin="0,0,0,2.5" IsChecked="{Binding UseRainbowLed, Mode=TwoWay}">
             <TextBlock Text="{ext:Locale ControllerSettingsLedColorRainbow}" />
         </CheckBox>
-        <StackPanel Grid.Row="2" Orientation="Horizontal" IsEnabled="{Binding !TurnOffLed}">
-            <TextBlock Margin="0,0,10,2.5" Text="{ext:Locale ControllerSettingsLedColorRainbowSpeed}" />
+        <StackPanel Orientation="Horizontal" Margin="0,0,0,2.5" IsEnabled="{Binding !TurnOffLed}">
+            <TextBlock Margin="0,0,10,0" VerticalAlignment="Center" Text="{ext:Locale ControllerSettingsLedColorRainbowSpeed}" />
             <controls:SliderScroll
-                Value="{Binding RainbowSpeed}"
                 Width="150"
-                Margin="0,0,0,2.5"
+                VerticalAlignment="Center"
+                Value="{Binding RainbowSpeed}"
                 TickFrequency="0.25"
                 IsSnapToTickEnabled="True"
                 LargeChange="1"
                 SmallChange="0.25"
                 Minimum="0"
                 Maximum="10" />
-            <TextBlock Margin="5,0,0,2.5" Text="{Binding RainbowSpeedText}" />
+            <TextBlock Width="40" Margin="5,0,0,0" VerticalAlignment="Center" Text="{Binding RainbowSpeedText}" />
         </StackPanel>
-        <StackPanel Grid.Row="3" Orientation="Horizontal" IsEnabled="{Binding ShowLedColorPicker}">
-            <TextBlock Text="{ext:Locale ControllerSettingsLedColor}" />
+        <StackPanel Orientation="Horizontal" IsEnabled="{Binding ShowLedColorPicker}">
+            <TextBlock VerticalAlignment="Center" Text="{ext:Locale ControllerSettingsLedColor}" />
             <ui:ColorPickerButton
                 Margin="20,0,0,0"
                 IsMoreButtonVisible="False"
@@ -46,5 +46,5 @@
                 Color="{Binding LedColor, Mode=TwoWay}">
             </ui:ColorPickerButton>
         </StackPanel>
-    </Grid>
+    </StackPanel>
 </UserControl>
diff --git a/src/Ryujinx/UI/Views/Input/MotionInputView.axaml b/src/Ryujinx/UI/Views/Input/MotionInputView.axaml
index 32189ac7f..069c86fde 100644
--- a/src/Ryujinx/UI/Views/Input/MotionInputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/MotionInputView.axaml
@@ -13,13 +13,13 @@
     Focusable="True">
     <StackPanel>
         <StackPanel Orientation="Vertical">
-            <Grid Margin="10,0,10,0" RowDefinitions="Auto,Auto" ColumnDefinitions="Auto,*,Auto">
+            <Grid Margin="10,0,10,0" RowDefinitions="Auto,Auto" ColumnDefinitions="Auto,*,45">
                 <TextBlock
                     Grid.Row="0"
                     Grid.Column="0"
                     VerticalAlignment="Center"
                     HorizontalAlignment="Center"
-                    Margin="0,0,10,0"
+                    Margin="5,0,10,0"
                     Text="{ext:Locale ControllerSettingsMotionGyroSensitivity}" />
                 <controls:SliderScroll
                     Grid.Row="0"
@@ -38,14 +38,14 @@
                     Grid.Column="2"
                     VerticalAlignment="Center"
                     HorizontalAlignment="Center"
-                    Margin="5,0,5,1"
+                    Margin="0,0,0,1"
                     Text="{Binding Sensitivity, StringFormat=\{0:0\}%}" />
                 <TextBlock
                     Grid.Row="1"
                     Grid.Column="0"
                     VerticalAlignment="Center"
                     HorizontalAlignment="Center"
-                    Margin="0,0,10,0"
+                    Margin="5,0,10,0"
                     Text="{ext:Locale ControllerSettingsMotionGyroDeadzone}" />
                 <controls:SliderScroll
                     Grid.Row="1"
@@ -64,7 +64,7 @@
                     Grid.Column="2"
                     VerticalAlignment="Center"
                     HorizontalAlignment="Center"
-                    Margin="5,0,5,1"
+                    Margin="0,0,0,1"
                     Text="{Binding GyroDeadzone, StringFormat=\{0:0.00\}}" />
             </Grid>
             <Separator Height="1" Margin="0,0,0,5" />
diff --git a/src/Ryujinx/UI/Views/Input/RumbleInputView.axaml b/src/Ryujinx/UI/Views/Input/RumbleInputView.axaml
index 0db593bde..e26dfb7a2 100644
--- a/src/Ryujinx/UI/Views/Input/RumbleInputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/RumbleInputView.axaml
@@ -10,7 +10,7 @@
     x:Class="Ryujinx.Ava.UI.Views.Input.RumbleInputView"
     x:DataType="viewModels:RumbleInputViewModel"
     Focusable="True">
-    <Grid Margin="10,10,10,0" RowDefinitions="Auto,Auto" ColumnDefinitions="Auto,*,Auto">
+    <Grid Margin="10,10,10,0" RowDefinitions="Auto,Auto" ColumnDefinitions="Auto,*,45">
         <TextBlock
             Grid.Row="0"
             Grid.Column="0"
@@ -29,7 +29,7 @@
         <TextBlock
             Grid.Row="0"
             Grid.Column="2"
-            Margin="5,0,5,1"
+            Margin="5,0,0,1"
             Text="{Binding StrongRumble, StringFormat=\{0:0.00\}}" />
         <TextBlock
             Grid.Row="1"
@@ -49,7 +49,7 @@
         <TextBlock
             Grid.Row="1"
             Grid.Column="2"
-            Margin="5,0,5,1"
+            Margin="5,0,0,1"
             Text="{Binding WeakRumble, StringFormat=\{0:0.00\}}" />
     </Grid>
 </UserControl>