diff --git a/plugins/taglist/xed-taglist-plugin-panel.c b/plugins/taglist/xed-taglist-plugin-panel.c
index a1b0622..17d52fe 100644
--- a/plugins/taglist/xed-taglist-plugin-panel.c
+++ b/plugins/taglist/xed-taglist-plugin-panel.c
@@ -639,8 +639,8 @@ add_preview_widget (XedTaglistPluginPanel *panel)
 
 	gtk_widget_set_halign (panel->priv->preview, GTK_ALIGN_START);
 	gtk_widget_set_valign (panel->priv->preview, GTK_ALIGN_START);
-	gtk_widget_set_margin_left (panel->priv->preview, 6);
-	gtk_widget_set_margin_right (panel->priv->preview, 6);
+	gtk_widget_set_margin_start (panel->priv->preview, 6);
+	gtk_widget_set_margin_end (panel->priv->preview, 6);
 	gtk_widget_set_margin_top (panel->priv->preview, 6);
 	gtk_widget_set_margin_bottom (panel->priv->preview, 6);
 
diff --git a/xed/xed-panel.c b/xed/xed-panel.c
index 785cca8..51addb8 100644
--- a/xed/xed-panel.c
+++ b/xed/xed-panel.c
@@ -423,8 +423,8 @@ build_tab_label (XedPanel    *panel,
     label = gtk_label_new (name);
 
     gtk_widget_set_halign (label, GTK_ALIGN_START);
-    gtk_widget_set_margin_left (label, 0);
-    gtk_widget_set_margin_right (label, 0);
+    gtk_widget_set_margin_start (label, 0);
+    gtk_widget_set_margin_end (label, 0);
     gtk_widget_set_margin_top (label, 0);
     gtk_widget_set_margin_bottom (label, 0);
 
diff --git a/xed/xed-statusbar.c b/xed/xed-statusbar.c
index 68fb289..d27dbc8 100644
--- a/xed/xed-statusbar.c
+++ b/xed/xed-statusbar.c
@@ -117,7 +117,7 @@ xed_statusbar_init (XedStatusbar *statusbar)
     gtk_label_set_width_chars (GTK_LABEL (statusbar->priv->overwrite_mode_label), get_overwrite_mode_length ());
     gtk_widget_show (statusbar->priv->overwrite_mode_label);
     gtk_box_pack_end (GTK_BOX (statusbar), statusbar->priv->overwrite_mode_label, FALSE, TRUE, 0);
-    gtk_widget_set_margin_right (GTK_WIDGET (statusbar->priv->overwrite_mode_label), 6);
+    gtk_widget_set_margin_end (GTK_WIDGET (statusbar->priv->overwrite_mode_label), 6);
 
     statusbar->priv->cursor_position_label = gtk_label_new (NULL);
     gtk_label_set_width_chars (GTK_LABEL (statusbar->priv->cursor_position_label), CURSOR_POSITION_LABEL_WIDTH_CHARS);
@@ -147,8 +147,8 @@ xed_statusbar_init (XedStatusbar *statusbar)
 
     error_image = gtk_image_new_from_icon_name ("dialog-error", GTK_ICON_SIZE_MENU);
 
-    gtk_widget_set_margin_left (error_image, 4);
-    gtk_widget_set_margin_right (error_image, 4);
+    gtk_widget_set_margin_start (error_image, 4);
+    gtk_widget_set_margin_end (error_image, 4);
     gtk_widget_set_margin_top (error_image, 0);
     gtk_widget_set_margin_bottom (error_image, 0);
 
diff --git a/xed/xed-tab-label.c b/xed/xed-tab-label.c
index a77c3d9..02a1754 100644
--- a/xed/xed-tab-label.c
+++ b/xed/xed-tab-label.c
@@ -294,8 +294,8 @@ xed_tab_label_init (XedTabLabel *tab_label)
     label = gtk_label_new ("");
 
     gtk_widget_set_halign (label, GTK_ALIGN_START);
-    gtk_widget_set_margin_left (label, 0);
-    gtk_widget_set_margin_right (label, 0);
+    gtk_widget_set_margin_start (label, 0);
+    gtk_widget_set_margin_end (label, 0);
     gtk_widget_set_margin_top (label, 0);
     gtk_widget_set_margin_bottom (label, 0);
 
diff --git a/xed/xed-utils.c b/xed/xed-utils.c
index d553555..10cb13e 100644
--- a/xed/xed-utils.c
+++ b/xed/xed-utils.c
@@ -920,8 +920,8 @@ handle_builder_error (const gchar *message,
     g_free (msg_plain);
     g_free (msg);
 
-    gtk_widget_set_margin_left (label, 5);
-    gtk_widget_set_margin_right (label, 5);
+    gtk_widget_set_margin_start (label, 5);
+    gtk_widget_set_margin_end (label, 5);
     gtk_widget_set_margin_top (label, 5);
     gtk_widget_set_margin_bottom (label, 5);
 
diff --git a/xed/xed-view-frame.c b/xed/xed-view-frame.c
index 9359d4c..60f0582 100644
--- a/xed/xed-view-frame.c
+++ b/xed/xed-view-frame.c
@@ -572,15 +572,8 @@ xed_view_frame_init (XedViewFrame *frame)
     gtk_widget_show (frame->priv->revealer);
     gtk_widget_set_halign (frame->priv->revealer, GTK_ALIGN_END);
     gtk_widget_set_valign (frame->priv->revealer, GTK_ALIGN_START);
-
-    if (gtk_widget_get_direction (frame->priv->revealer) == GTK_TEXT_DIR_LTR)
-    {
-        gtk_widget_set_margin_right (frame->priv->revealer, SEARCH_POPUP_MARGIN);
-    }
-    else
-    {
-        gtk_widget_set_margin_left (frame->priv->revealer, SEARCH_POPUP_MARGIN);
-    }
+    gtk_widget_set_margin_end (frame->priv->revealer, SEARCH_POPUP_MARGIN);
+    gtk_widget_set_margin_start (frame->priv->revealer, SEARCH_POPUP_MARGIN);
 
     gtk_overlay_add_overlay (GTK_OVERLAY (frame->priv->overlay), frame->priv->revealer);
 }
diff --git a/xed/xed-window.c b/xed/xed-window.c
index 14c75b1..a402c95 100644
--- a/xed/xed-window.c
+++ b/xed/xed-window.c
@@ -1726,8 +1726,8 @@ create_statusbar (XedWindow *window,
 
     gtk_box_pack_end (GTK_BOX( main_box), window->priv->statusbar, FALSE, TRUE, 0);
 
-    gtk_widget_set_margin_left (GTK_WIDGET (window->priv->statusbar), 0);
-    gtk_widget_set_margin_right (GTK_WIDGET (window->priv->statusbar), 0);
+    gtk_widget_set_margin_start (GTK_WIDGET (window->priv->statusbar), 0);
+    gtk_widget_set_margin_end (GTK_WIDGET (window->priv->statusbar), 0);
 
     window->priv->tab_width_combo = xed_status_combo_box_new (_("Tab Width"));
     gtk_widget_show (window->priv->tab_width_combo);
@@ -1754,7 +1754,7 @@ create_statusbar (XedWindow *window,
     button_box = gtk_box_new (GTK_ORIENTATION_HORIZONTAL, 4);
     gtk_widget_set_margin_top (button_box, 4);
     gtk_widget_set_margin_bottom (button_box, 4);
-    gtk_widget_set_margin_left (button_box, 6);
+    gtk_widget_set_margin_start (button_box, 6);
     gtk_box_pack_start (GTK_BOX (window->priv->statusbar), button_box, FALSE, FALSE, 0);
 
     window->priv->show_side_pane_button = gtk_toggle_button_new ();