diff --git a/src/addressbook/gui/contact-editor/contact-editor.ui b/src/addressbook/gui/contact-editor/contact-editor.ui
index f09f69e236359f802047109fdbfebdda051c6521..dbdb72f507999a9af9fa44464e741b46bd7ab070 100644
--- a/src/addressbook/gui/contact-editor/contact-editor.ui
+++ b/src/addressbook/gui/contact-editor/contact-editor.ui
@@ -404,11 +404,12 @@
                           <object class="GtkHSeparator" id="hseparator10">
                             <property name="visible">True</property>
                             <property name="can_focus">False</property>
+                            <property name="margin-top">6</property>
+                            <property name="margin-bottom">6</property>
                           </object>
                           <packing>
                             <property name="expand">False</property>
                             <property name="fill">False</property>
-                            <property name="padding">6</property>
                             <property name="position">1</property>
                           </packing>
                         </child>
@@ -1283,8 +1284,8 @@
                                 <property name="border_width">6</property>
                                 <property name="yalign">0.15000000596046448</property>
                                 <property name="yscale">0.69999998807907104</property>
-                                <property name="left_padding">19</property>
-                                <property name="right_padding">10</property>
+                                <property name="margin-start">19</property>
+                                <property name="margin-end">10</property>
                                 <child>
                                   <object class="GtkHBox" id="hbox59">
                                     <property name="visible">True</property>
@@ -1511,8 +1512,8 @@
                                 <property name="border_width">6</property>
                                 <property name="yalign">0.15000000596046448</property>
                                 <property name="yscale">0.69999998807907104</property>
-                                <property name="left_padding">19</property>
-                                <property name="right_padding">10</property>
+                                <property name="margin-start">19</property>
+                                <property name="margin-end">10</property>
                                 <child>
                                   <object class="GtkHBox" id="hbox98">
                                     <property name="visible">True</property>
@@ -1737,8 +1738,8 @@
                                 <property name="border_width">6</property>
                                 <property name="yalign">0.15000000596046448</property>
                                 <property name="yscale">0.69999998807907104</property>
-                                <property name="left_padding">19</property>
-                                <property name="right_padding">10</property>
+                                <property name="margin-start">19</property>
+                                <property name="margin-end">10</property>
                                 <child>
                                   <object class="GtkHBox" id="hbox103">
                                     <property name="visible">True</property>
diff --git a/src/addressbook/gui/contact-list-editor/contact-list-editor.ui b/src/addressbook/gui/contact-list-editor/contact-list-editor.ui
index 6413239bd440761490c31fcca4196b4e6adfcfe2..d64030dbdd5a1817ab6d2de8257aa514ab834679 100644
--- a/src/addressbook/gui/contact-list-editor/contact-list-editor.ui
+++ b/src/addressbook/gui/contact-list-editor/contact-list-editor.ui
@@ -169,7 +169,7 @@
                   <object class="GtkAlignment" id="members-alignment">
                     <property name="visible">True</property>
                     <property name="can_focus">False</property>
-                    <property name="left_padding">12</property>
+                    <property name="margin-start">12</property>
                     <child>
                       <object class="GtkGrid" id="members-grid">
                         <property name="visible">True</property>
diff --git a/src/e-util/e-import-assistant.c b/src/e-util/e-import-assistant.c
index b9c2fac1993b1a5d3f2772199bdc1e95975accc6..490eaf428ee18872473694d4e1cff848bb35dbb7 100644
--- a/src/e-util/e-import-assistant.c
+++ b/src/e-util/e-import-assistant.c
@@ -1371,16 +1371,20 @@ import_assistant_construct (EImportAssistant *import_assistant)
 		/* complex import assistant pages */
 
 		/* Start page */
-		page = gtk_label_new ("");
-		gtk_label_set_line_wrap (GTK_LABEL (page), TRUE);
-		gtk_label_set_width_chars (GTK_LABEL (page), 20);
-		gtk_label_set_xalign (GTK_LABEL (page), 0);
-		gtk_misc_set_padding (GTK_MISC (page), 12, 12);
-		gtk_label_set_text (GTK_LABEL (page), _(
-			"Welcome to the Evolution Import Assistant.\n"
-			"With this assistant you will be guided through the "
-			"process of importing external files into Evolution."));
-		gtk_widget_show (page);
+		page = g_object_new (GTK_TYPE_LABEL,
+			"line-wrap", TRUE,
+			"width-chars", 20,
+			"xalign", 0.0,
+			"margin-start", 12,
+			"margin-end", 12,
+			"margin-top", 12,
+			"margin-bottom", 12,
+			"text", _(
+				"Welcome to the Evolution Import Assistant.\n"
+				"With this assistant you will be guided through the "
+				"process of importing external files into Evolution."),
+			"visible", TRUE,
+			NULL);
 
 		gtk_assistant_append_page (assistant, page);
 		gtk_assistant_set_page_title (
diff --git a/src/e-util/e-name-selector-dialog.c b/src/e-util/e-name-selector-dialog.c
index e8305185034388181de11ce3e7b7e071fa0dfee5..b15061967dcaed18ffeab3bef2833c782cec7c83 100644
--- a/src/e-util/e-name-selector-dialog.c
+++ b/src/e-util/e-name-selector-dialog.c
@@ -409,12 +409,15 @@ name_selector_dialog_constructed (GObject *object)
 	gtk_widget_show (destination_vgrid);
 	gtk_container_add (GTK_CONTAINER (hgrid), destination_vgrid);
 
-	status_message = gtk_label_new ("");
-	gtk_widget_show (status_message);
+	status_message = g_object_new (
+		GTK_TYPE_LABEL,
+		"margin-top", 3,
+		"margin-bottom", 3,
+		"use-markup", TRUE,
+		"visible", TRUE,
+		"xalign", 0.0,
+		NULL);
 	gtk_container_add (GTK_CONTAINER (name_selector_grid), status_message);
-	gtk_label_set_use_markup (GTK_LABEL (status_message), TRUE);
-	gtk_label_set_xalign (GTK_LABEL (status_message), 0);
-	gtk_misc_set_padding (GTK_MISC (status_message), 0, 3);
 
 	gtk_label_set_mnemonic_widget (GTK_LABEL (AddressBookLabel), source_menu_hgrid);
 	gtk_label_set_mnemonic_widget (GTK_LABEL (label_category), combobox_category);
diff --git a/src/e-util/filter.ui b/src/e-util/filter.ui
index 866066f4d5b59f779343a9857dfe9d2f829d20eb..7fb1c9622faf030d1756be36bf95054468c0f0a5 100644
--- a/src/e-util/filter.ui
+++ b/src/e-util/filter.ui
@@ -131,11 +131,12 @@
       <object class="GtkHSeparator" id="hseparator1">
         <property name="visible">True</property>
         <property name="can_focus">False</property>
+        <property name="margin-top">1</property>
+        <property name="margin-bottom">1</property>
       </object>
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
-        <property name="padding">1</property>
         <property name="position">1</property>
       </packing>
     </child>
@@ -248,8 +249,8 @@ a time relative to when filtering occurs.</property>
               <object class="GtkAlignment" id="alignment1">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="top_padding">5</property>
-                <property name="left_padding">58</property>
+                <property name="margin-top">5</property>
+                <property name="margin-start">58</property>
                 <child>
                   <object class="GtkHBox" id="hbox6">
                     <property name="visible">True</property>
@@ -312,7 +313,6 @@ a time relative to when filtering occurs.</property>
               <packing>
                 <property name="expand">False</property>
                 <property name="fill">True</property>
-                <property name="padding">2</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -638,7 +638,6 @@ a time relative to when filtering occurs.</property>
       <packing>
         <property name="expand">True</property>
         <property name="fill">True</property>
-        <property name="padding">3</property>
         <property name="position">2</property>
       </packing>
     </child>
diff --git a/src/e-util/gal-view-instance-save-as-dialog.ui b/src/e-util/gal-view-instance-save-as-dialog.ui
index 435482079b21acb1f2560bb68f27a6775b5c3e1e..567d3c34402e6b51153efee025b7f620349799b2 100644
--- a/src/e-util/gal-view-instance-save-as-dialog.ui
+++ b/src/e-util/gal-view-instance-save-as-dialog.ui
@@ -33,7 +33,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="left_padding">24</property>
+            <property name="margin-start">24</property>
             <child>
               <object class="GtkHBox" id="hbox1">
                 <property name="visible">True</property>
@@ -109,7 +109,7 @@
             <property name="visible">True</property>
             <property name="can_focus">False</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_POINTER_MOTION_HINT_MASK | GDK_BUTTON_PRESS_MASK | GDK_BUTTON_RELEASE_MASK</property>
-            <property name="left_padding">24</property>
+            <property name="margin-start">24</property>
             <child>
               <object class="GtkScrolledWindow" id="scrolledwindow2">
                 <property name="visible">True</property>
diff --git a/src/mail/mail-config.ui b/src/mail/mail-config.ui
index 33ecf7c84e68feae9cf8da79a57a2f4cc6a7a2b2..919b2850f686b46a7c76027399c3764e1baac6fb 100644
--- a/src/mail/mail-config.ui
+++ b/src/mail/mail-config.ui
@@ -202,7 +202,7 @@
               <object class="GtkAlignment" id="default-behavior-alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
+                <property name="margin-start">12</property>
                 <child>
                   <object class="GtkVBox" id="default-behavior-vbox">
                     <property name="visible">True</property>
@@ -483,7 +483,7 @@
               <object class="GtkAlignment" id="replies-and-forwards-alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
+                <property name="margin-start">12</property>
                 <child>
                   <object class="GtkGrid">
                     <property name="visible">True</property>
@@ -789,7 +789,7 @@
               <object class="GtkAlignment" id="signature-alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
+                <property name="margin-start">12</property>
                 <child>
                   <placeholder/>
                 </child>
@@ -858,7 +858,7 @@
               <object class="GtkAlignment" id="languages-alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
+                <property name="margin-start">12</property>
                 <child>
                   <object class="GtkGrid" id="languages-grid">
                     <property name="visible">True</property>
@@ -960,7 +960,7 @@
               <object class="GtkAlignment" id="spell-options-alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
+                <property name="margin-start">12</property>
                 <child>
                   <object class="GtkVBox" id="spell-options-vbox">
                     <property name="visible">True</property>
@@ -1040,7 +1040,7 @@
           <object class="GtkAlignment" id="confirmation-alignment">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="left_padding">12</property>
+            <property name="margin-start">12</property>
             <child>
               <object class="GtkVBox" id="confirmation-vbox">
                 <property name="visible">True</property>
@@ -1389,10 +1389,10 @@
               <object class="GtkAlignment" id="sao-folders-alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="top_padding">6</property>
-                <property name="bottom_padding">6</property>
-                <property name="left_padding">6</property>
-                <property name="right_padding">6</property>
+                <property name="margin-top">6</property>
+                <property name="margin-bottom">6</property>
+                <property name="margin-start">6</property>
+                <property name="margin-end">6</property>
                 <child>
                   <object class="GtkGrid" id="sao-folders-grid">
                     <property name="visible">True</property>
@@ -1501,10 +1501,10 @@
               <object class="GtkAlignment" id="sao-recipients-alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="top_padding">6</property>
-                <property name="bottom_padding">6</property>
-                <property name="left_padding">6</property>
-                <property name="right_padding">6</property>
+                <property name="margin-top">6</property>
+                <property name="margin-bottom">6</property>
+                <property name="margin-start">6</property>
+                <property name="margin-end">6</property>
                 <child>
                   <object class="GtkGrid" id="sao-recipients-grid">
                     <property name="visible">True</property>
@@ -1624,10 +1624,10 @@
               <object class="GtkAlignment" id="sao-account-alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="top_padding">6</property>
-                <property name="bottom_padding">6</property>
-                <property name="left_padding">6</property>
-                <property name="right_padding">6</property>
+                <property name="margin-top">6</property>
+                <property name="margin-bottom">6</property>
+                <property name="margin-start">6</property>
+                <property name="margin-end">6</property>
                 <child>
                   <object class="GtkScrolledWindow" id="soa-account-scrolledwindow">
                     <property name="visible">True</property>
@@ -1834,7 +1834,7 @@
               <object class="GtkAlignment" id="start-up-alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
+                <property name="margin-start">12</property>
                 <child>
                   <object class="GtkVBox" id="start-up-vbox">
                     <property name="visible">True</property>
@@ -1937,7 +1937,7 @@
               <object class="GtkAlignment" id="message-display-alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
+                <property name="margin-start">12</property>
                 <child>
                   <object class="GtkVBox" id="message-display-vbox">
                     <property name="visible">True</property>
@@ -1963,7 +1963,7 @@
                       <object class="GtkAlignment" id="custom-font-alignment">
                         <property name="visible">True</property>
                         <property name="can_focus">False</property>
-                        <property name="left_padding">24</property>
+                        <property name="margin-start">24</property>
                         <child>
                           <object class="GtkGrid">
                             <property name="visible">True</property>
@@ -2325,7 +2325,7 @@
               <object class="GtkAlignment" id="delete-mail-alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
+                <property name="margin-start">12</property>
                 <child>
                   <object class="GtkVBox" id="delete-mail-vbox">
                     <property name="visible">True</property>
@@ -2466,7 +2466,7 @@
               <object class="GtkAlignment" id="archive-mail-alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
+                <property name="margin-start">12</property>
                 <child>
                   <object class="GtkVBox" id="archive-mail-vbox">
                     <property name="visible">True</property>
@@ -2563,7 +2563,7 @@
               <object class="GtkAlignment" id="html-general-alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
+                <property name="margin-start">12</property>
                 <child>
                   <object class="GtkVBox" id="html-general-vbox">
                     <property name="visible">True</property>
@@ -2642,7 +2642,7 @@
               <object class="GtkAlignment" id="loading-images-alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
+                <property name="margin-start">12</property>
                 <child>
                   <object class="GtkVBox" id="loading-images-vbox">
                     <property name="visible">True</property>
@@ -2990,7 +2990,7 @@
           <object class="GtkAlignment" id="labels-alignment">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="left_padding">12</property>
+            <property name="margin-start">12</property>
             <child>
               <placeholder/>
             </child>
@@ -3050,7 +3050,7 @@
               <object class="GtkAlignment" id="photograph-alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
+                <property name="margin-start">12</property>
                 <child>
                   <object class="GtkVBox" id="photograph-vbox">
                     <property name="visible">True</property>
@@ -3148,7 +3148,7 @@
               <object class="GtkAlignment" id="message-headers-alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
+                <property name="margin-start">12</property>
                 <child>
                   <object class="GtkHBox" id="message-headers-hbox">
                     <property name="visible">True</property>
@@ -3302,7 +3302,7 @@
               <object class="GtkAlignment" id="user-headers-alignment">
                 <property name="visible">True</property>
                 <property name="can_focus">False</property>
-                <property name="left_padding">12</property>
+                <property name="margin-start">12</property>
                 <child>
                   <object class="GtkHBox" id="user-headers-hbox">
                     <property name="visible">True</property>
diff --git a/src/modules/calendar/e-calendar-preferences.ui b/src/modules/calendar/e-calendar-preferences.ui
index fc22614062b2af7451c4387b0779341344925a04..6987d64daa45346e2f968f658b9c383a9e50df66 100644
--- a/src/modules/calendar/e-calendar-preferences.ui
+++ b/src/modules/calendar/e-calendar-preferences.ui
@@ -1579,8 +1579,8 @@
           <object class="GtkAlignment" id="alignment1">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="bottom_padding">10</property>
-            <property name="left_padding">10</property>
+            <property name="margin-bottom">10</property>
+            <property name="margin-start">10</property>
             <child>
               <object class="GtkVBox" id="alarm_options_vbox">
                 <property name="visible">True</property>
@@ -2010,7 +2010,7 @@
           <object class="GtkAlignment" id="default-freebusy-alignment">
             <property name="visible">True</property>
             <property name="can_focus">False</property>
-            <property name="left_padding">12</property>
+            <property name="margin-start">12</property>
             <child>
               <object class="GtkVBox" id="default-freebusy-vbox">
                 <property name="visible">True</property>