diff --git a/gtk/ui/gtkfontchooserwidget.ui b/gtk/ui/gtkfontchooserwidget.ui
index 25b1f7083a..0ffb9fe434 100644
--- a/gtk/ui/gtkfontchooserwidget.ui
+++ b/gtk/ui/gtkfontchooserwidget.ui
@@ -235,8 +235,8 @@
                   <object class="GtkEntry" id="preview2">
                     <property name="can-focus">1</property>
                     <property name="placeholder-text" translatable="yes">Preview text</property>
-                    <property name="text" bind-source="preview" bind-property="text" bind-flags="bidirectional"></property>
-                    <property name="attributes" bind-source="preview" bind-property="attributes" bind-flags="bidirectional"></property>
+                    <property name="text" bind-source="preview" bind-property="text" bind-flags="bidirectional"/>
+                    <property name="attributes" bind-source="preview" bind-property="attributes" bind-flags="bidirectional"/>
                   </object>
                 </child>
                 <child>
diff --git a/gtk/ui/gtkmediacontrols.ui b/gtk/ui/gtkmediacontrols.ui
index 9a32138682..19eee4f4e2 100644
--- a/gtk/ui/gtkmediacontrols.ui
+++ b/gtk/ui/gtkmediacontrols.ui
@@ -35,10 +35,10 @@
             <child>
               <object class="GtkScale" id="seek_scale">
                 <property name="adjustment">time_adjustment</property>
-                <property name="can_focus">True</property>
-                <property name="draw_value">False</property>
-                <property name="restrict-to-fill-level">False</property>
-                <property name="hexpand">True</property>
+                <property name="can_focus">1</property>
+                <property name="draw_value">0</property>
+                <property name="restrict-to-fill-level">0</property>
+                <property name="hexpand">1</property>
               </object>
             </child>
             <child>
diff --git a/gtk/ui/gtkpagesetupunixdialog.ui b/gtk/ui/gtkpagesetupunixdialog.ui
index d5ee851318..85ffaf0c9a 100644
--- a/gtk/ui/gtkpagesetupunixdialog.ui
+++ b/gtk/ui/gtkpagesetupunixdialog.ui
@@ -119,7 +119,6 @@
                 <property name="can-focus">1</property>
                 <property name="hexpand">1</property>
                 <property name="active">1</property>
-                <property name="draw-indicator">1</property>
                 <child>
                   <object class="GtkBox" id="box1">
                     <property name="spacing">6</property>
@@ -146,7 +145,6 @@
                 <property name="can-focus">1</property>
                 <property name="hexpand">1</property>
                 <property name="active">1</property>
-                <property name="draw-indicator">1</property>
                 <property name="group">portrait_radio</property>
                 <child>
                   <object class="GtkBox" id="box2">
@@ -174,7 +172,6 @@
                 <property name="can-focus">1</property>
                 <property name="hexpand">1</property>
                 <property name="active">1</property>
-                <property name="draw-indicator">1</property>
                 <property name="group">portrait_radio</property>
                 <child>
                   <object class="GtkBox" id="box3">
@@ -201,7 +198,6 @@
               <object class="GtkRadioButton" id="reverse_landscape_radio">
                 <property name="can-focus">1</property>
                 <property name="hexpand">1</property>
-                <property name="draw-indicator">1</property>
                 <property name="group">portrait_radio</property>
                 <child>
                   <object class="GtkBox" id="box4">
diff --git a/gtk/ui/gtkplacesview.ui b/gtk/ui/gtkplacesview.ui
index 8d2bba6001..39022efdb9 100644
--- a/gtk/ui/gtkplacesview.ui
+++ b/gtk/ui/gtkplacesview.ui
@@ -271,7 +271,6 @@
             <property name="valign">center</property>
             <signal name="clicked" handler="on_connect_button_clicked" object="GtkPlacesView" swapped="yes"/>
           </object>
-          <packing/>
         </child>
         <child type="end">
           <object class="GtkBox">
@@ -309,7 +308,6 @@
               <class name="linked"/>
             </style>
           </object>
-          <packing/>
         </child>
       </object>
     </child>
diff --git a/gtk/ui/gtkplacesviewrow.ui b/gtk/ui/gtkplacesviewrow.ui
index 21045e6069..6225d3b9ec 100644
--- a/gtk/ui/gtkplacesviewrow.ui
+++ b/gtk/ui/gtkplacesviewrow.ui
@@ -2,7 +2,7 @@
   <requires lib="gtk+" version="3.16"/>
   <template class="GtkPlacesViewRow" parent="GtkListBoxRow">
     <property name="width-request">100</property>
-    <property name="can-focus">True</property>
+    <property name="can-focus">1</property>
     <child>
       <object class="GtkBox" id="box">
         <property name="margin-start">12</property>
diff --git a/gtk/ui/gtksidebarrow.ui b/gtk/ui/gtksidebarrow.ui
index d2ebdd2b08..b31078fe5b 100644
--- a/gtk/ui/gtksidebarrow.ui
+++ b/gtk/ui/gtksidebarrow.ui
@@ -59,7 +59,7 @@
                 <property name="halign">center</property>
                 <property name="valign">center</property>
                 <property name="margin-start">4px</property>
-                <property name="visible">False</property>
+                <property name="visible">0</property>
               </object>
             </child>
           </object>
diff --git a/gtk/ui/gtkvideo.ui b/gtk/ui/gtkvideo.ui
index b4d96563ea..6a479e1aa3 100644
--- a/gtk/ui/gtkvideo.ui
+++ b/gtk/ui/gtkvideo.ui
@@ -15,10 +15,10 @@
             <property name="valign">center</property>
             <property name="icon-name">media-playback-start-symbolic</property>
             <property name="icon-size">large</property>
+            <layout>
+              <property name="measure">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="measure">1</property>
-          </packing>
         </child>
         <child type="overlay">
           <object class="GtkRevealer" id="controls_revealer">
@@ -31,10 +31,10 @@
                 </style>
               </object>
             </child>
+            <layout>
+              <property name="measure">1</property>
+            </layout>
           </object>
-          <packing>
-            <property name="measure">1</property>
-          </packing>
         </child>
       </object>
     </child>
diff --git a/tests/visuals/osd-toolbars.ui b/tests/visuals/osd-toolbars.ui
index ac8ae6242f..4211375234 100644
--- a/tests/visuals/osd-toolbars.ui
+++ b/tests/visuals/osd-toolbars.ui
@@ -1,43 +1,29 @@
-<?xml version="1.0" encoding="UTF-8"?>
 <interface>
-  <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <property name="default_width">600</property>
     <property name="default_height">600</property>
     <child>
       <object class="GtkOverlay" id="overlay1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
-            <object class="GtkDrawingArea" id="filler">
-                <property name="visible">True</property>
-            </object>
+          <object class="GtkDrawingArea" id="filler"/>
         </child>
         <child type="overlay">
           <object class="GtkToolbar" id="bottom_toolbar">
-            <property name="visible">True</property>
-            <property name="show_arrow">False</property>
+            <property name="show_arrow">0</property>
             <property name="halign">center</property>
             <property name="valign">end</property>
             <property name="margin_bottom">24</property>
             <style>
-                <class name="osd"/>
+              <class name="osd"/>
             </style>
             <child>
               <object class="GtkToolItem" id="left_item">
-                <property name="visible">True</property>
                 <child>
                   <object class="GtkBox" id="left_box">
-                    <property name="orientation">horizontal</property>
-                    <property name="spacing">0</property>
-                    <property name="visible">True</property>
                     <child>
                       <object class="GtkToggleButton" id="camera">
-                        <property name="visible">True</property>
                         <child>
                           <object class="GtkImage" id="camera_icon">
-                            <property name="visible">True</property>
                             <property name="icon_name">camera-web-symbolic</property>
                           </object>
                         </child>
@@ -45,11 +31,9 @@
                     </child>
                     <child>
                       <object class="GtkToggleButton" id="volume">
-                        <property name="visible">True</property>
-                        <property name="active">True</property>
+                        <property name="active">1</property>
                         <child>
                           <object class="GtkImage" id="volume_icon">
-                            <property name="visible">True</property>
                             <property name="icon_name">audio-volume-medium-symbolic</property>
                           </object>
                         </child>
@@ -57,11 +41,9 @@
                     </child>
                     <child>
                       <object class="GtkToggleButton" id="microphone">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
+                        <property name="sensitive">0</property>
                         <child>
                           <object class="GtkImage" id="microphone_icon">
-                            <property name="visible">True</property>
                             <property name="icon_name">audio-input-microphone-symbolic</property>
                           </object>
                         </child>
@@ -69,12 +51,10 @@
                     </child>
                     <child>
                       <object class="GtkToggleButton" id="bt">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
-                        <property name="active">True</property>
+                        <property name="sensitive">0</property>
+                        <property name="active">1</property>
                         <child>
                           <object class="GtkImage" id="bt_icon">
-                            <property name="visible">True</property>
                             <property name="icon_name">bluetooth-active-symbolic</property>
                           </object>
                         </child>
@@ -86,19 +66,14 @@
             </child>
             <child>
               <object class="GtkSeparatorToolItem" id="toolbutton2">
-                <property name="draw">False</property>
-                <property name="visible">True</property>
+                <property name="expand-item">True</property>
+                <property name="draw">0</property>
               </object>
-              <packing>
-                <property name="expand">True</property>
-              </packing>
             </child>
             <child>
               <object class="GtkToolItem" id="toolitem4">
-                <property name="visible">True</property>
                 <child>
                   <object class="GtkLabel" id="status_label">
-                    <property name="visible">True</property>
                     <property name="label">OSD Toolbar</property>
                     <property name="margin_start">10</property>
                     <property name="margin_end">10</property>
@@ -108,18 +83,12 @@
             </child>
             <child>
               <object class="GtkToolItem" id="right_item">
-                <property name="visible">True</property>
                 <child>
                   <object class="GtkBox" id="right_box">
-                    <property name="orientation">horizontal</property>
-                    <property name="spacing">0</property>
-                    <property name="visible">True</property>
                     <child>
                       <object class="GtkToggleButton" id="opt">
-                        <property name="visible">True</property>
                         <child>
                           <object class="GtkImage" id="opt_icon">
-                            <property name="visible">True</property>
                             <property name="icon_name">media-optical-symbolic</property>
                           </object>
                         </child>
@@ -127,11 +96,9 @@
                     </child>
                     <child>
                       <object class="GtkToggleButton" id="hdd">
-                        <property name="visible">True</property>
-                        <property name="active">True</property>
+                        <property name="active">1</property>
                         <child>
                           <object class="GtkImage" id="hdd_icon">
-                            <property name="visible">True</property>
                             <property name="icon_name">drive-harddisk-symbolic</property>
                           </object>
                         </child>
@@ -139,11 +106,9 @@
                     </child>
                     <child>
                       <object class="GtkToggleButton" id="joy">
-                        <property name="visible">True</property>
-                        <property name="sensitive">False</property>
+                        <property name="sensitive">0</property>
                         <child>
                           <object class="GtkImage" id="joy_icon">
-                            <property name="visible">True</property>
                             <property name="icon_name">input-gaming-symbolic</property>
                           </object>
                         </child>
@@ -157,44 +122,37 @@
         </child>
         <child type="overlay">
           <object class="GtkToolbar" id="top_toolbar">
-            <property name="visible">True</property>
-            <property name="show_arrow">False</property>
+            <property name="show_arrow">0</property>
             <property name="halign">center</property>
             <property name="valign">start</property>
             <property name="margin_top">24</property>
             <style>
-                <class name="osd"/>
+              <class name="osd"/>
             </style>
             <child>
               <object class="GtkToggleToolButton" id="tb1">
-                <property name="visible">True</property>
                 <property name="icon_name">edit-undo-symbolic</property>
               </object>
             </child>
             <child>
               <object class="GtkToggleToolButton" id="tb2">
-                <property name="visible">True</property>
                 <property name="icon_name">edit-redo-symbolic</property>
               </object>
             </child>
             <child>
               <object class="GtkToggleToolButton" id="tb3">
-                <property name="visible">True</property>
                 <property name="icon_name">start-here-symbolic</property>
               </object>
             </child>
             <child>
               <object class="GtkToggleToolButton" id="tb4">
-                <property name="visible">True</property>
                 <property name="icon_name">applications-science-symbolic</property>
               </object>
             </child>
             <child>
               <object class="GtkToolItem" id="tb5">
-                <property name="visible">True</property>
                 <child>
                   <object class="GtkLabel" id="tb5_label">
-                    <property name="visible">True</property>
                     <property name="label">Another kind of OSD toolbar</property>
                     <property name="margin_start">10</property>
                     <property name="margin_end">10</property>
diff --git a/testsuite/reftests/opacity-initial.ui b/testsuite/reftests/opacity-initial.ui
index 9e02798575..7d8a4b2af8 100644
--- a/testsuite/reftests/opacity-initial.ui
+++ b/testsuite/reftests/opacity-initial.ui
@@ -1,24 +1,17 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
     <property name="width_request">200</property>
     <property name="height_request">100</property>
-    <property name="can_focus">False</property>
     <property name="type">popup</property>
     <child>
       <object class="GtkOverlay" id="overlay1">
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <placeholder/>
         </child>
         <child type="overlay">
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
-            <property name="label" translatable="yes">I'm the invisible label.
+            <property name="label" translatable="yes">I&apos;m the invisible label.
 Incredible how you can
 see right through me.</property>
           </object>
diff --git a/testsuite/reftests/overlay-no-main-widget.ref.ui b/testsuite/reftests/overlay-no-main-widget.ref.ui
index a895631761..2e5a5abcd0 100644
--- a/testsuite/reftests/overlay-no-main-widget.ref.ui
+++ b/testsuite/reftests/overlay-no-main-widget.ref.ui
@@ -1,19 +1,12 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkOverlay" id="overlay1">
         <property name="width_request">100</property>
         <property name="height_request">100</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <object class="GtkBox" id="box1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <placeholder/>
@@ -22,8 +15,6 @@
         </child>
         <child type="overlay">
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">VISIBLE</property>
           </object>
         </child>
diff --git a/testsuite/reftests/overlay-no-main-widget.ui b/testsuite/reftests/overlay-no-main-widget.ui
index 08abb83bd0..056026fd58 100644
--- a/testsuite/reftests/overlay-no-main-widget.ui
+++ b/testsuite/reftests/overlay-no-main-widget.ui
@@ -1,22 +1,15 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.18.1 -->
 <interface>
   <requires lib="gtk+" version="3.12"/>
   <object class="GtkWindow" id="window1">
-    <property name="can_focus">False</property>
     <child>
       <object class="GtkOverlay" id="overlay1">
         <property name="width_request">100</property>
         <property name="height_request">100</property>
-        <property name="visible">True</property>
-        <property name="can_focus">False</property>
         <child>
           <placeholder/>
         </child>
         <child type="overlay">
           <object class="GtkLabel" id="label1">
-            <property name="visible">True</property>
-            <property name="can_focus">False</property>
             <property name="label" translatable="yes">VISIBLE</property>
           </object>
         </child>