diff --git a/panels/printers/printers.ui b/panels/printers/printers.ui
index e12c97508..403cd29b8 100644
--- a/panels/printers/printers.ui
+++ b/panels/printers/printers.ui
@@ -181,13 +181,13 @@
                         <property name="left_attach">1</property>
                         <property name="top_attach">7</property>
                         <property name="bottom_attach">8</property>
-                        <property name="y_options"></property>
+                        <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkLabel" id="label12">
                         <property name="visible">True</property>
-                        <property name="label" translatable="yes">	</property>
+                        <property name="label" translatable="yes"></property>
                       </object>
                       <packing>
                         <property name="top_attach">7</property>
@@ -219,7 +219,7 @@
                         <property name="left_attach">1</property>
                         <property name="top_attach">6</property>
                         <property name="bottom_attach">7</property>
-                        <property name="y_options"></property>
+                        <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
                     <child>
@@ -228,14 +228,16 @@
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="receives_default">True</property>
+                        <property name="halign">GTK_ALIGN_END</property>
+                        <property name="valign">GTK_ALIGN_CENTER</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
                         <property name="right_attach">3</property>
                         <property name="top_attach">6</property>
                         <property name="bottom_attach">7</property>
-                        <property name="x_options">GTK_SHRINK</property>
-                        <property name="y_options"></property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
                     <child>
@@ -264,8 +266,8 @@
                       </object>
                       <packing>
                         <property name="bottom_attach">2</property>
-                        <property name="x_options"></property>
-                        <property name="y_options"></property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
                     <child>
@@ -278,7 +280,7 @@
                         <property name="top_attach">3</property>
                         <property name="bottom_attach">4</property>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
+                        <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
                     <child>
@@ -291,7 +293,7 @@
                         <property name="top_attach">4</property>
                         <property name="bottom_attach">5</property>
                         <property name="x_options">GTK_FILL</property>
-                        <property name="y_options"></property>
+                        <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
                     <child>
@@ -305,7 +307,7 @@
                         <property name="left_attach">1</property>
                         <property name="top_attach">3</property>
                         <property name="bottom_attach">4</property>
-                        <property name="y_options"></property>
+                        <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
                     <child>
@@ -318,31 +320,23 @@
                         <property name="left_attach">1</property>
                         <property name="top_attach">4</property>
                         <property name="bottom_attach">5</property>
-                        <property name="y_options"></property>
+                        <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkVBox" id="disable-switch-vbox">
+                      <object class="GtkSwitch" id="printer-disable-switch">
                         <property name="visible">True</property>
-                        <child>
-                          <object class="GtkSwitch" id="printer-disable-switch">
-                            <property name="visible">True</property>
-                            <property name="can_focus">True</property>
-                            <property name="receives_default">True</property>
-                          </object>
-                          <packing>
-                            <property name="expand">False</property>
-                            <property name="fill">False</property>
-                            <property name="position">0</property>
-                          </packing>
-                        </child>
+                        <property name="can_focus">True</property>
+                        <property name="receives_default">True</property>
+                        <property name="halign">GTK_ALIGN_END</property>
+                        <property name="valign">GTK_ALIGN_CENTER</property>
                       </object>
                       <packing>
                         <property name="left_attach">2</property>
                         <property name="right_attach">3</property>
                         <property name="bottom_attach">2</property>
-                        <property name="x_options"></property>
-                        <property name="y_options"></property>
+                        <property name="x_options">GTK_FILL</property>
+                        <property name="y_options">GTK_FILL</property>
                       </packing>
                     </child>
                     <child>
@@ -354,7 +348,8 @@
                         <property name="right_attach">3</property>
                         <property name="top_attach">2</property>
                         <property name="bottom_attach">3</property>
-                        <property name="x_options"></property>
+                        <property name="x_options">0</property>
+                        <property name="y_options">0</property>
                       </packing>
                     </child>
                     <child>
@@ -366,7 +361,8 @@
                         <property name="right_attach">3</property>
                         <property name="top_attach">3</property>
                         <property name="bottom_attach">4</property>
-                        <property name="x_options"></property>
+                        <property name="x_options">0</property>
+                        <property name="y_options">0</property>
                       </packing>
                     </child>
                     <child>
@@ -378,7 +374,8 @@
                         <property name="right_attach">3</property>
                         <property name="top_attach">4</property>
                         <property name="bottom_attach">5</property>
-                        <property name="x_options"></property>
+                        <property name="x_options">0</property>
+                        <property name="y_options">0</property>
                       </packing>
                     </child>
                     <child>
@@ -390,7 +387,8 @@
                         <property name="right_attach">3</property>
                         <property name="top_attach">5</property>
                         <property name="bottom_attach">6</property>
-                        <property name="x_options"></property>
+                        <property name="x_options">0</property>
+                        <property name="y_options">0</property>
                       </packing>
                     </child>
                     <child>
@@ -402,7 +400,8 @@
                         <property name="right_attach">3</property>
                         <property name="top_attach">7</property>
                         <property name="bottom_attach">8</property>
-                        <property name="x_options"></property>
+                        <property name="x_options">0</property>
+                        <property name="y_options">0</property>
                       </packing>
                     </child>
                   </object>