diff --git a/panels/wacom/cc-wacom-page.c b/panels/wacom/cc-wacom-page.c
index 6d737046f..1d1e29890 100644
--- a/panels/wacom/cc-wacom-page.c
+++ b/panels/wacom/cc-wacom-page.c
@@ -790,7 +790,7 @@ cc_wacom_page_init (CcWacomPage *self)
 
 	priv->nav = cc_wacom_nav_button_new ();
         gtk_widget_set_halign (priv->nav, GTK_ALIGN_END);
-        gtk_widget_set_margin_left (priv->nav, 10);
+        gtk_widget_set_margin_start (priv->nav, 10);
 	gtk_grid_attach (GTK_GRID (box), priv->nav, 1, 0, 1, 1);
 
 	priv->cancellable = g_cancellable_new ();
diff --git a/panels/wacom/cc-wacom-panel.c b/panels/wacom/cc-wacom-panel.c
index f1cdc6893..a17aa64e7 100644
--- a/panels/wacom/cc-wacom-panel.c
+++ b/panels/wacom/cc-wacom-panel.c
@@ -506,8 +506,8 @@ cc_wacom_panel_init (CcWacomPanel *self)
 	gtk_container_set_border_width (GTK_CONTAINER (notebook), 0);
 	g_object_set (G_OBJECT (notebook),
 		      "margin-top", 6,
-		      "margin-right", 30,
-		      "margin-left", 30,
+		      "margin-end", 30,
+		      "margin-start", 30,
 		      "margin-bottom", 30,
 		      NULL);
 
diff --git a/panels/wacom/cc-wacom-stylus-page.c b/panels/wacom/cc-wacom-stylus-page.c
index b063d52a6..6f8124f8b 100644
--- a/panels/wacom/cc-wacom-stylus-page.c
+++ b/panels/wacom/cc-wacom-stylus-page.c
@@ -329,7 +329,7 @@ cc_wacom_stylus_page_init (CcWacomStylusPage *self)
 
 	priv->nav = cc_wacom_nav_button_new ();
         gtk_widget_set_halign (priv->nav, GTK_ALIGN_END);
-        gtk_widget_set_margin_left (priv->nav, 10);
+        gtk_widget_set_margin_start (priv->nav, 10);
 	gtk_grid_attach (GTK_GRID (box), priv->nav, 1, 0, 1, 1);
 }
 
diff --git a/panels/wacom/gnome-wacom-properties.ui b/panels/wacom/gnome-wacom-properties.ui
index 82e80ac63..4785c3828 100644
--- a/panels/wacom/gnome-wacom-properties.ui
+++ b/panels/wacom/gnome-wacom-properties.ui
@@ -303,7 +303,7 @@
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="orientation">vertical</property>
-                    <property name="margin_left">16</property>
+                    <property name="margin_start">16</property>
                     <property name="row_spacing">10</property>
                     <property name="column_spacing">10</property>
                     <child>
diff --git a/panels/wacom/wacom-stylus-page.ui b/panels/wacom/wacom-stylus-page.ui
index 3da37e178..fcc74da07 100644
--- a/panels/wacom/wacom-stylus-page.ui
+++ b/panels/wacom/wacom-stylus-page.ui
@@ -105,7 +105,7 @@
         <property name="visible">True</property>
         <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
-        <property name="margin_left">16</property>
+        <property name="margin_start">16</property>
         <property name="margin_top">6</property>
         <property name="row_spacing">10</property>
         <property name="column_spacing">10</property>