diff --git a/bec_widgets/widgets/plots_next_gen/setting_menus/axis_settings_horizontal.ui b/bec_widgets/widgets/plots_next_gen/setting_menus/axis_settings_horizontal.ui
index 323f99c7..ea8291c7 100644
--- a/bec_widgets/widgets/plots_next_gen/setting_menus/axis_settings_horizontal.ui
+++ b/bec_widgets/widgets/plots_next_gen/setting_menus/axis_settings_horizontal.ui
@@ -58,19 +58,6 @@
                                 </property>
                             </widget>
                         </item>
-                        <item row="2" column="2">
-                            <widget class="QDoubleSpinBox" name="x_max">
-                                <property name="alignment">
-                                    <set>Qt::AlignmentFlag::AlignCenter</set>
-                                </property>
-                                <property name="minimum">
-                                    <double>-9999.000000000000000</double>
-                                </property>
-                                <property name="maximum">
-                                    <double>9999.000000000000000</double>
-                                </property>
-                            </widget>
-                        </item>
                         <item row="2" column="0">
                             <widget class="QLabel" name="x_max_label">
                                 <property name="text">
@@ -85,19 +72,6 @@
                                 </property>
                             </widget>
                         </item>
-                        <item row="1" column="2">
-                            <widget class="QDoubleSpinBox" name="x_min">
-                                <property name="alignment">
-                                    <set>Qt::AlignmentFlag::AlignCenter</set>
-                                </property>
-                                <property name="minimum">
-                                    <double>-9999.000000000000000</double>
-                                </property>
-                                <property name="maximum">
-                                    <double>9999.000000000000000</double>
-                                </property>
-                            </widget>
-                        </item>
                         <item row="3" column="0">
                             <widget class="QLabel" name="x_scale_label">
                                 <property name="text">
@@ -122,6 +96,12 @@
                         <item row="0" column="2">
                             <widget class="QLineEdit" name="x_label"/>
                         </item>
+                        <item row="1" column="2">
+                            <widget class="BECSpinBox" name="x_min"/>
+                        </item>
+                        <item row="2" column="2">
+                            <widget class="BECSpinBox" name="x_max"/>
+                        </item>
                     </layout>
                 </widget>
             </item>
@@ -131,19 +111,6 @@
                         <string>Y Axis</string>
                     </property>
                     <layout class="QGridLayout" name="gridLayout_5">
-                        <item row="2" column="2">
-                            <widget class="QDoubleSpinBox" name="y_max">
-                                <property name="alignment">
-                                    <set>Qt::AlignmentFlag::AlignCenter</set>
-                                </property>
-                                <property name="minimum">
-                                    <double>-9999.000000000000000</double>
-                                </property>
-                                <property name="maximum">
-                                    <double>9999.000000000000000</double>
-                                </property>
-                            </widget>
-                        </item>
                         <item row="1" column="0" colspan="2">
                             <widget class="QLabel" name="y_min_label">
                                 <property name="text">
@@ -151,19 +118,6 @@
                                 </property>
                             </widget>
                         </item>
-                        <item row="1" column="2">
-                            <widget class="QDoubleSpinBox" name="y_min">
-                                <property name="alignment">
-                                    <set>Qt::AlignmentFlag::AlignCenter</set>
-                                </property>
-                                <property name="minimum">
-                                    <double>-9999.000000000000000</double>
-                                </property>
-                                <property name="maximum">
-                                    <double>9999.000000000000000</double>
-                                </property>
-                            </widget>
-                        </item>
                         <item row="0" column="2">
                             <widget class="QLineEdit" name="y_label"/>
                         </item>
@@ -209,6 +163,19 @@
                                 </property>
                             </widget>
                         </item>
+                        <item row="1" column="2">
+                            <widget class="BECSpinBox" name="y_min">
+                                <property name="alignment">
+                                    <set>Qt::AlignmentFlag::AlignCenter</set>
+                                </property>
+                                <property name="buttonSymbols">
+                                    <enum>QAbstractSpinBox::ButtonSymbols::UpDownArrows</enum>
+                                </property>
+                            </widget>
+                        </item>
+                        <item row="2" column="2">
+                            <widget class="BECSpinBox" name="y_max"/>
+                        </item>
                     </layout>
                 </widget>
             </item>
@@ -229,6 +196,11 @@
         </layout>
     </widget>
     <customwidgets>
+        <customwidget>
+            <class>BECSpinBox</class>
+            <extends>QDoubleSpinBox</extends>
+            <header>bec_spin_box</header>
+        </customwidget>
         <customwidget>
             <class>ToggleSwitch</class>
             <extends>QWidget</extends>
diff --git a/bec_widgets/widgets/plots_next_gen/setting_menus/axis_settings_vertical.ui b/bec_widgets/widgets/plots_next_gen/setting_menus/axis_settings_vertical.ui
index 28c61a63..8a4798e1 100644
--- a/bec_widgets/widgets/plots_next_gen/setting_menus/axis_settings_vertical.ui
+++ b/bec_widgets/widgets/plots_next_gen/setting_menus/axis_settings_vertical.ui
@@ -20,19 +20,6 @@
                         <string>X Axis</string>
                     </property>
                     <layout class="QGridLayout" name="gridLayout_4">
-                        <item row="2" column="2">
-                            <widget class="QDoubleSpinBox" name="x_max">
-                                <property name="alignment">
-                                    <set>Qt::AlignmentFlag::AlignCenter</set>
-                                </property>
-                                <property name="minimum">
-                                    <double>-9999.000000000000000</double>
-                                </property>
-                                <property name="maximum">
-                                    <double>9999.000000000000000</double>
-                                </property>
-                            </widget>
-                        </item>
                         <item row="3" column="0">
                             <widget class="QLabel" name="x_scale_label">
                                 <property name="text">
@@ -64,19 +51,6 @@
                                 </property>
                             </widget>
                         </item>
-                        <item row="1" column="2">
-                            <widget class="QDoubleSpinBox" name="x_min">
-                                <property name="alignment">
-                                    <set>Qt::AlignmentFlag::AlignCenter</set>
-                                </property>
-                                <property name="minimum">
-                                    <double>-9999.000000000000000</double>
-                                </property>
-                                <property name="maximum">
-                                    <double>9999.000000000000000</double>
-                                </property>
-                            </widget>
-                        </item>
                         <item row="1" column="0" colspan="2">
                             <widget class="QLabel" name="x_min_label">
                                 <property name="text">
@@ -98,6 +72,12 @@
                                 </property>
                             </widget>
                         </item>
+                        <item row="1" column="2">
+                            <widget class="BECSpinBox" name="x_min"/>
+                        </item>
+                        <item row="2" column="2">
+                            <widget class="BECSpinBox" name="x_max"/>
+                        </item>
                     </layout>
                 </widget>
             </item>
@@ -128,19 +108,6 @@
                         <string>Y Axis</string>
                     </property>
                     <layout class="QGridLayout" name="gridLayout_5">
-                        <item row="2" column="2">
-                            <widget class="QDoubleSpinBox" name="y_max">
-                                <property name="alignment">
-                                    <set>Qt::AlignmentFlag::AlignCenter</set>
-                                </property>
-                                <property name="minimum">
-                                    <double>-9999.000000000000000</double>
-                                </property>
-                                <property name="maximum">
-                                    <double>9999.000000000000000</double>
-                                </property>
-                            </widget>
-                        </item>
                         <item row="1" column="0" colspan="2">
                             <widget class="QLabel" name="y_min_label">
                                 <property name="text">
@@ -148,19 +115,6 @@
                                 </property>
                             </widget>
                         </item>
-                        <item row="1" column="2">
-                            <widget class="QDoubleSpinBox" name="y_min">
-                                <property name="alignment">
-                                    <set>Qt::AlignmentFlag::AlignCenter</set>
-                                </property>
-                                <property name="minimum">
-                                    <double>-9999.000000000000000</double>
-                                </property>
-                                <property name="maximum">
-                                    <double>9999.000000000000000</double>
-                                </property>
-                            </widget>
-                        </item>
                         <item row="0" column="2">
                             <widget class="QLineEdit" name="y_label"/>
                         </item>
@@ -206,6 +160,12 @@
                                 </property>
                             </widget>
                         </item>
+                        <item row="1" column="2">
+                            <widget class="BECSpinBox" name="y_min"/>
+                        </item>
+                        <item row="2" column="2">
+                            <widget class="BECSpinBox" name="y_max"/>
+                        </item>
                     </layout>
                 </widget>
             </item>
@@ -229,6 +189,11 @@
         </layout>
     </widget>
     <customwidgets>
+        <customwidget>
+            <class>BECSpinBox</class>
+            <extends>QDoubleSpinBox</extends>
+            <header>bec_spin_box</header>
+        </customwidget>
         <customwidget>
             <class>ToggleSwitch</class>
             <extends>QWidget</extends>