diff --git a/Source/RMG-Input/UserInterface/Widget/ControllerImageWidget.cpp b/Source/RMG-Input/UserInterface/Widget/ControllerImageWidget.cpp
index 841bc252..a074feda 100644
--- a/Source/RMG-Input/UserInterface/Widget/ControllerImageWidget.cpp
+++ b/Source/RMG-Input/UserInterface/Widget/ControllerImageWidget.cpp
@@ -141,6 +141,7 @@ void ControllerImageWidget::paintEvent(QPaintEvent *event)
 
     // render base image first
     renderer.load(baseImageUri);
+    renderer.setAspectRatioMode(Qt::AspectRatioMode::KeepAspectRatio);
     renderer.render(&painter);
 
     // render button images on top
@@ -150,12 +151,14 @@ void ControllerImageWidget::paintEvent(QPaintEvent *event)
         if (this->buttonState[(int)button.button])
         {
             renderer.load(button.imageUri);
+            renderer.setAspectRatioMode(Qt::AspectRatioMode::KeepAspectRatio);
             renderer.render(&painter);
         }
     }
 
     // render analog stick
     renderer.load(analogStickImageUri);
+    renderer.setAspectRatioMode(Qt::AspectRatioMode::KeepAspectRatio);
 
     QRectF rectF = renderer.viewBoxF();
     double offsetx = 0, offsety = 0;
@@ -206,24 +209,3 @@ void ControllerImageWidget::paintEvent(QPaintEvent *event)
     renderer.setViewBox(rectF);
     renderer.render(&painter);
 }
-
-void ControllerImageWidget::resizeEvent(QResizeEvent *event)
-{
-    const QSize& currentSize = event->size();
-
-    // calculate expected width & height
-    const int width = currentSize.width();
-    const int height = std::ceil(currentSize.width() * 0.9759f);
-    const QSize expectedSize = QSize(width, height);
-
-    // set widget's size as needed,
-    // the widget resize function doesn't work
-    // as expected, so set the minimum size
-    if (currentSize != expectedSize)
-    {
-        this->setMinimumSize(expectedSize);
-        this->update();
-    }
-
-    QWidget::resizeEvent(event);
-}
diff --git a/Source/RMG-Input/UserInterface/Widget/ControllerImageWidget.hpp b/Source/RMG-Input/UserInterface/Widget/ControllerImageWidget.hpp
index 70373311..b933ebee 100644
--- a/Source/RMG-Input/UserInterface/Widget/ControllerImageWidget.hpp
+++ b/Source/RMG-Input/UserInterface/Widget/ControllerImageWidget.hpp
@@ -49,7 +49,6 @@ public:
     void UpdateImage();
 
     void paintEvent(QPaintEvent *event) override;
-    void resizeEvent(QResizeEvent *event) override;
 };
 }
 }
diff --git a/Source/RMG-Input/UserInterface/Widget/ControllerWidget.ui b/Source/RMG-Input/UserInterface/Widget/ControllerWidget.ui
index 51f14c83..6725df64 100644
--- a/Source/RMG-Input/UserInterface/Widget/ControllerWidget.ui
+++ b/Source/RMG-Input/UserInterface/Widget/ControllerWidget.ui
@@ -561,23 +561,10 @@
          </item>
         </layout>
        </item>
-       <item>
-        <spacer name="verticalSpacer_3">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item>
         <widget class="ControllerImageWidget" name="controllerImageWidget" native="true">
          <property name="sizePolicy">
-          <sizepolicy hsizetype="Minimum" vsizetype="Minimum">
+          <sizepolicy hsizetype="Expanding" vsizetype="Expanding">
            <horstretch>0</horstretch>
            <verstretch>0</verstretch>
           </sizepolicy>
@@ -590,19 +577,6 @@
          </property>
         </widget>
        </item>
-       <item>
-        <spacer name="verticalSpacer_4">
-         <property name="orientation">
-          <enum>Qt::Vertical</enum>
-         </property>
-         <property name="sizeHint" stdset="0">
-          <size>
-           <width>20</width>
-           <height>40</height>
-          </size>
-         </property>
-        </spacer>
-       </item>
        <item>
         <layout class="QHBoxLayout" name="horizontalLayout">
          <item>