diff --git a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
index c592c2b14..1d34f9fa9 100644
--- a/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
+++ b/src/Ryujinx/UI/Views/Input/ControllerInputView.axaml
@@ -320,7 +320,7 @@
                     BorderBrush="{DynamicResource ThemeControlBorderColor}"
                     BorderThickness="1"
                     CornerRadius="5"
-                    Margin="0,10"
+                    Margin="0,5"
                     MinHeight="90">
                     <StackPanel Orientation="Vertical">
                         <Image
@@ -335,9 +335,7 @@
                             Spacing="20"
                             HorizontalAlignment="Center">
                             <Border
-                                BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                                BorderThickness="1"
-                                CornerRadius="5"
+                                BorderBrush="Transparent"
                                 Height="{Binding Visualizer.UiStickBorderSize}"
                                 Width="{Binding Visualizer.UiStickBorderSize}"
                                 IsVisible="{Binding IsLeft}">
@@ -351,19 +349,19 @@
                                         Background="{DynamicResource ThemeBackgroundColor}">
                                         <Ellipse
                                             HorizontalAlignment="Center"
-                                            Stroke="Black"
+                                            Stroke="{DynamicResource ThemeControlBorderColor}"
                                             StrokeThickness="1"
                                             Width="{Binding Visualizer.UiCanvasSize}"
                                             Height="{Binding Visualizer.UiCanvasSize}" />
                                         <Ellipse
                                             HorizontalAlignment="Center"
-                                            Fill="Gray"
+                                            Fill="Black"
                                             Opacity="100"
                                             Height="{Binding Visualizer.UiDeadzoneLeft}"
                                             Width="{Binding Visualizer.UiDeadzoneLeft}" />
                                     </Grid>
                                     <Ellipse
-                                        Fill="Red"
+                                        Fill="{DynamicResource Warning}"
                                         Width="{Binding Visualizer.UiStickCircumference}"
                                         Height="{Binding Visualizer.UiStickCircumference}"
                                         Canvas.Bottom="{Binding Visualizer.UiStickLeftY}"
@@ -371,9 +369,7 @@
                                 </Canvas>
                             </Border>
                             <Border
-                                BorderBrush="{DynamicResource ThemeControlBorderColor}"
-                                BorderThickness="1"
-                                CornerRadius="5"
+                                BorderBrush="Transparent"
                                 Height="{Binding Visualizer.UiStickBorderSize}"
                                 Width="{Binding Visualizer.UiStickBorderSize}"
                                 IsVisible="{Binding IsRight}">
@@ -387,19 +383,19 @@
                                         Background="{DynamicResource ThemeBackgroundColor}">
                                         <Ellipse
                                             HorizontalAlignment="Center"
-                                            Stroke="Black"
+                                            Stroke="{DynamicResource ThemeControlBorderColor}"
                                             StrokeThickness="1"
                                             Width="{Binding Visualizer.UiCanvasSize}"
                                             Height="{Binding Visualizer.UiCanvasSize}" />
                                         <Ellipse
                                             HorizontalAlignment="Center"
-                                            Fill="Gray"
+                                            Fill="Black"
                                             Opacity="100"
                                             Height="{Binding Visualizer.UiDeadzoneRight}"
                                             Width="{Binding Visualizer.UiDeadzoneRight}" />
                                     </Grid>
                                     <Ellipse
-                                        Fill="Red"
+                                        Fill="{DynamicResource Warning}"
                                         Width="{Binding Visualizer.UiStickCircumference}"
                                         Height="{Binding Visualizer.UiStickCircumference}"
                                         Canvas.Bottom="{Binding Visualizer.UiStickRightY}"