diff --git a/panels/wacom/cc-wacom-stylus-page.c b/panels/wacom/cc-wacom-stylus-page.c
index 82ff2f8022ff7f9f80e6a257ee39220c6f691e53..aace87883ff17763296d9f0b6f1980999481cdb0 100644
--- a/panels/wacom/cc-wacom-stylus-page.c
+++ b/panels/wacom/cc-wacom-stylus-page.c
@@ -297,19 +297,10 @@ cc_wacom_stylus_page_class_init (CcWacomStylusPageClass *klass)
 	gtk_widget_class_bind_template_callback (widget_class, on_eraser_pressure_value_changed);
 }
 
-static void
-add_marks (GtkScale *scale)
-{
-	gtk_scale_add_mark (scale, 100, GTK_POS_BOTTOM, NULL);
-}
-
 static void
 cc_wacom_stylus_page_init (CcWacomStylusPage *page)
 {
 	gtk_widget_init_template (GTK_WIDGET (page));
-
-	add_marks (GTK_SCALE (page->stylus_tip_pressure_scale));
-	add_marks (GTK_SCALE (page->stylus_eraser_pressure_scale));
 }
 
 static void
diff --git a/panels/wacom/cc-wacom-stylus-page.ui b/panels/wacom/cc-wacom-stylus-page.ui
index b78933c23c33e31682cbe67760e13e7608dc2379..67b00fcfa7351bb01f39e85742cf3b27adc821b6 100644
--- a/panels/wacom/cc-wacom-stylus-page.ui
+++ b/panels/wacom/cc-wacom-stylus-page.ui
@@ -18,36 +18,22 @@
           <object class="AdwActionRow" id="stylus_tip_pressure">
             <property name="title" translatable="yes">Tip _Pressure Feel</property>
             <property name="use-underline">true</property>
+            <property name="activatable-widget">stylus_tip_pressure_scale</property>
             <child>
-              <object class="GtkBox" id="stylus_tip_pressure_box">
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Soft</property>
-                    <style>
-                      <class name="caption"/>
-                    </style>
+              <object class="GtkScale" id="stylus_tip_pressure_scale">
+                <signal name="value-changed" handler="on_tip_pressure_value_changed" swapped="yes"/>
+                <marks>
+                  <mark value="0" translatable="yes" comments="Translators: This is a mark in the 'Tip Pressure Feel' scale">Soft</mark>
+                  <mark value="100"/>
+                  <mark value="200" translatable="yes" comments="Translators: This is a mark in the 'Tip Pressure Feel' scale">Firm</mark>
+                </marks>
+                <property name="adjustment">
+                  <object class="GtkAdjustment" id="stylus_tip_pressure_adjustment">
+                    <property name="upper">200</property>
+                    <property name="step_increment">20</property>
+                    <property name="page_increment">60</property>
                   </object>
-                </child>
-                <child>
-                  <object class="GtkScale" id="stylus_tip_pressure_scale">
-                    <property name="adjustment">stylus_tip_pressure_adjustment</property>
-                    <property name="draw_value">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
-                    <signal name="value-changed" handler="on_tip_pressure_value_changed" swapped="yes"/>
-                    <accessibility>
-                      <property name="label" translatable="yes">Stylus tip pressure</property>
-                    </accessibility>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Firm</property>
-                    <style>
-                      <class name="caption"/>
-                    </style>
-                  </object>
-                </child>
+                </property>
               </object>
             </child>
           </object>
@@ -113,36 +99,22 @@
           <object class="AdwActionRow" id="stylus_eraser_pressure">
             <property name="title" translatable="yes">_Eraser Pressure Feel</property>
             <property name="use-underline">true</property>
+            <property name="activatable-widget">stylus_eraser_pressure_scale</property>
             <child>
-              <object class="GtkBox" id="stylus_eraser_pressure_box">
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Soft</property>
-                    <style>
-                      <class name="caption"/>
-                    </style>
-                  </object>
-                </child>
-                <child>
-                  <object class="GtkScale" id="stylus_eraser_pressure_scale">
-                    <property name="adjustment">stylus_eraser_pressure_adjustment</property>
-                    <property name="draw_value">False</property>
-                    <property name="hexpand">True</property>
-                    <property name="vexpand">True</property>
-                    <signal name="value-changed" handler="on_eraser_pressure_value_changed" swapped="yes"/>
-                    <accessibility>
-                      <property name="label" translatable="yes">Eraser pressure</property>
-                    </accessibility>
+              <object class="GtkScale" id="stylus_eraser_pressure_scale">
+                <signal name="value-changed" handler="on_eraser_pressure_value_changed" swapped="yes"/>
+                <marks>
+                  <mark value="0" translatable="yes" comments="Translators: This is a mark in the 'Erase Pressure Feel' scale">Soft</mark>
+                  <mark value="100"/>
+                  <mark value="200" translatable="yes" comments="Translators: This is a mark in the 'Erase Pressure Feel' scale">Firm</mark>
+                </marks>
+                <property name="adjustment">
+                  <object class="GtkAdjustment" id="stylus_eraser_pressure_adjustment">
+                    <property name="upper">200</property>
+                    <property name="step_increment">20</property>
+                    <property name="page_increment">60</property>
                   </object>
-                </child>
-                <child>
-                  <object class="GtkLabel">
-                    <property name="label" translatable="yes">Firm</property>
-                    <style>
-                      <class name="caption"/>
-                    </style>
-                  </object>
-                </child>
+                </property>
               </object>
             </child>
           </object>
@@ -150,20 +122,10 @@
       </object>
     </child>
   </template>
-  <object class="GtkAdjustment" id="stylus_tip_pressure_adjustment">
-    <property name="upper">200</property>
-    <property name="step_increment">20</property>
-    <property name="page_increment">60</property>
-  </object>
-  <object class="GtkAdjustment" id="stylus_eraser_pressure_adjustment">
-    <property name="upper">200</property>
-    <property name="step_increment">20</property>
-    <property name="page_increment">60</property>
-  </object>
   <object class="GtkSizeGroup" id="sizegroup_pressure">
     <widgets>
-      <widget name="stylus_tip_pressure_box" />
-      <widget name="stylus_eraser_pressure_box" />
+      <widget name="stylus_tip_pressure_scale" />
+      <widget name="stylus_eraser_pressure_scale" />
     </widgets>
   </object>
 </interface>