[gedit] Revert "Run gtk-builder-tool simplify on our ui files"



commit 2e799694043c232bafda0fb1e2272458a66e6995
Author: Sébastien Wilmet <swilmet gnome org>
Date:   Fri Oct 16 16:28:03 2015 +0200

    Revert "Run gtk-builder-tool simplify on our ui files"
    
    This reverts commit ce5813531d3ed5d5111c1908f582bc981ad2b644.
    
    There were at least two regressions (in gedit-view-frame.ui and
    spell-checker.ui). So it's simpler to revert the change. When
    gtk-builder-tool will be more stable, we can run it again.

 gedit/resources/ui/gedit-encodings-dialog.ui       |   24 +++++
 gedit/resources/ui/gedit-highlight-mode-dialog.ui  |   22 ++++
 .../resources/ui/gedit-highlight-mode-selector.ui  |    5 +
 gedit/resources/ui/gedit-open-document-selector.ui |    4 +
 gedit/resources/ui/gedit-preferences-dialog.ui     |   54 ++++++++++-
 gedit/resources/ui/gedit-print-preferences.ui      |  103 +++++++++++++++++++-
 gedit/resources/ui/gedit-print-preview.ui          |   88 +++++++++++++++++
 gedit/resources/ui/gedit-progress-info-bar.ui      |   24 +++++-
 gedit/resources/ui/gedit-replace-dialog.ui         |   40 ++++++++
 gedit/resources/ui/gedit-status-menu-button.ui     |   13 +++
 gedit/resources/ui/gedit-statusbar.ui              |   24 +++++
 gedit/resources/ui/gedit-tab-label.ui              |    8 +-
 gedit/resources/ui/gedit-view-frame.ui             |    8 ++
 gedit/resources/ui/gedit-window.ui                 |   59 +++++++++++-
 .../docinfo/resources/ui/gedit-docinfo-plugin.ui   |   65 ++++++++++++-
 plugins/externaltools/tools/outputpanel.ui         |    2 +
 plugins/externaltools/tools/tools.ui               |   66 +++++++++++++
 .../resources/ui/gedit-file-browser-widget.ui      |   39 +++++---
 plugins/pythonconsole/pythonconsole/config.ui      |    3 +
 plugins/snippets/snippets/snippets.ui              |   57 +++++++++++
 plugins/sort/resources/ui/gedit-sort-plugin.ui     |   51 +++++++---
 plugins/spell/resources/ui/languages-dialog.ui     |    5 +
 plugins/spell/resources/ui/spell-checker.ui        |   27 +++++
 plugins/time/resources/ui/gedit-time-dialog.ui     |   35 +++++++
 .../time/resources/ui/gedit-time-setup-dialog.ui   |   31 ++++++
 25 files changed, 818 insertions(+), 39 deletions(-)
---
diff --git a/gedit/resources/ui/gedit-encodings-dialog.ui b/gedit/resources/ui/gedit-encodings-dialog.ui
index d359052..5a14ca8 100644
--- a/gedit/resources/ui/gedit-encodings-dialog.ui
+++ b/gedit/resources/ui/gedit-encodings-dialog.ui
@@ -36,6 +36,7 @@
     <child type="titlebar">
       <object class="GtkHeaderBar" id="header_bar">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="has_subtitle">False</property>
         <property name="title" translatable="yes">Character Encodings</property>
         <child>
@@ -62,11 +63,13 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkGrid" id="encodings_dialog_contents">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">6</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">18</property>
@@ -74,6 +77,7 @@
             <child>
               <object class="GtkLabel" id="available_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="label" translatable="yes">A_vailable Encodings</property>
                 <property name="use_underline">True</property>
@@ -91,6 +95,7 @@
             <child>
               <object class="GtkLabel" id="chosen_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="valign">start</property>
                 <property name="label" translatable="yes">Cho_sen Encodings</property>
                 <property name="use_underline">True</property>
@@ -108,6 +113,7 @@
             <child>
               <object class="GtkBox" id="box_available">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="orientation">vertical</property>
@@ -155,14 +161,22 @@
                       </object>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
                 <child>
                   <object class="GtkToolbar" id="toolbar_available">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="toolbar_style">icons</property>
                     <property name="icon_size">2</property>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -175,6 +189,7 @@
             <child>
               <object class="GtkBox" id="box_chosen">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="orientation">vertical</property>
@@ -222,13 +237,21 @@
                       </object>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
                 <child>
                   <object class="GtkToolbar" id="toolbar_chosen">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="icon_size">2</property>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
@@ -241,6 +264,7 @@
           </object>
           <packing>
             <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/gedit/resources/ui/gedit-highlight-mode-dialog.ui 
b/gedit/resources/ui/gedit-highlight-mode-dialog.ui
index 4011e26..2484d76 100644
--- a/gedit/resources/ui/gedit-highlight-mode-dialog.ui
+++ b/gedit/resources/ui/gedit-highlight-mode-dialog.ui
@@ -13,10 +13,16 @@
     <property name="modal">True</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
+        <property name="can_focus">False</property>
+        <property name="has_focus">False</property>
+        <property name="is_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
+            <property name="can_focus">False</property>
+            <property name="has_focus">False</property>
+            <property name="is_focus">False</property>
             <property name="layout_style">end</property>
             <property name="border_width">5</property>
             <property name="spacing">6</property>
@@ -25,26 +31,40 @@
                 <property name="label" translatable="yes">_Cancel</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="has_focus">False</property>
+                <property name="is_focus">False</property>
                 <property name="receives_default">True</property>
                 <property name="use_underline">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="ok_button">
                 <property name="label" translatable="yes">_Select</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="has_focus">False</property>
+                <property name="is_focus">False</property>
                 <property name="receives_default">True</property>
                 <property name="can_default">True</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -55,6 +75,8 @@
             <property name="is_focus">True</property>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/gedit/resources/ui/gedit-highlight-mode-selector.ui 
b/gedit/resources/ui/gedit-highlight-mode-selector.ui
index 0f3f090..bcb5515 100644
--- a/gedit/resources/ui/gedit-highlight-mode-selector.ui
+++ b/gedit/resources/ui/gedit-highlight-mode-selector.ui
@@ -26,6 +26,7 @@
         <property name="visible">True</property>
         <property name="can_focus">True</property>
         <property name="has_focus">True</property>
+        <property name="is_focus">False</property>
         <property name="activates_default">True</property>
         <property name="placeholder_text" translatable="yes">Search highlight mode...</property>
       </object>
@@ -40,6 +41,8 @@
       <object class="GtkScrolledWindow" id="scrolledwindow1">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="has_focus">False</property>
+        <property name="is_focus">False</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
         <property name="shadow_type">in</property>
@@ -47,6 +50,8 @@
           <object class="GtkTreeView" id="treeview">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="has_focus">False</property>
+            <property name="is_focus">False</property>
             <property name="model">treemodelfilter</property>
             <property name="headers_visible">False</property>
             <property name="headers_clickable">False</property>
diff --git a/gedit/resources/ui/gedit-open-document-selector.ui 
b/gedit/resources/ui/gedit-open-document-selector.ui
index ed54e4f..062ea83 100644
--- a/gedit/resources/ui/gedit-open-document-selector.ui
+++ b/gedit/resources/ui/gedit-open-document-selector.ui
@@ -23,6 +23,8 @@
     </child>
     <child>
       <object class="GtkFrame" id="placeholder_box">
+        <property name="visible">False</property>
+        <property name="can_focus">False</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
         <property name="shadow_type">in</property>
@@ -37,6 +39,7 @@
                 <property name="visible">True</property>
                 <property name="icon_name">edit-find-symbolic</property>
                 <property name="pixel_size">64</property>
+                <property name="can_focus">False</property>
                 <style>
                   <class name="dim-label"/>
                 </style>
@@ -46,6 +49,7 @@
               <object class="GtkLabel" id="placeholder_label">
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">No results</property>
                 <style>
                   <class name="dim-label"/>
diff --git a/gedit/resources/ui/gedit-preferences-dialog.ui b/gedit/resources/ui/gedit-preferences-dialog.ui
index ab83057..83cd049 100644
--- a/gedit/resources/ui/gedit-preferences-dialog.ui
+++ b/gedit/resources/ui/gedit-preferences-dialog.ui
@@ -14,22 +14,26 @@
       <object class="GtkHeaderBar" id="header_bar">
         <property name="title" translatable="yes">Preferences</property>
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="show-close-button">True</property>
-      </object>
+       </object>
     </child>
     <child>
       <object class="GtkNotebook" id="notebook">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="border_width">0</property>
         <property name="show_border">False</property>
         <child>
           <object class="GtkGrid" id="grid6">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">12</property>
             <property name="row_spacing">18</property>
             <child>
               <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">6</property>
                 <child>
@@ -37,6 +41,7 @@
                     <property name="label" translatable="yes">_Display line numbers</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -51,6 +56,7 @@
                     <property name="label" translatable="yes">Display right _margin at column:</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -62,6 +68,7 @@
                 <child>
                   <object class="GtkGrid" id="right_margin_position_grid">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkSpinButton" id="right_margin_position_spinbutton">
                         <property name="visible">True</property>
@@ -88,6 +95,7 @@
                     <property name="label" translatable="yes">Display _statusbar</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -102,6 +110,7 @@
                     <property name="label" translatable="yes">Display _overview map</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -116,6 +125,7 @@
                     <property name="label" translatable="yes">Display _grid pattern</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
@@ -134,10 +144,12 @@
             <child>
               <object class="GtkGrid" id="grid2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label848">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Text Wrapping</property>
                     <attributes>
@@ -152,6 +164,7 @@
                 <child>
                   <object class="GtkGrid" id="grid3">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="margin_start">12</property>
                     <property name="row_spacing">6</property>
                     <child>
@@ -159,6 +172,7 @@
                         <property name="label" translatable="yes">Enable text _wrapping</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -172,6 +186,7 @@
                         <property name="label" translatable="yes">Do not _split words over two 
lines</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -195,10 +210,12 @@
             <child>
               <object class="GtkGrid" id="grid4">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label876">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Highlighting</property>
                     <attributes>
@@ -213,6 +230,7 @@
                 <child>
                   <object class="GtkGrid" id="grid5">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="margin_start">12</property>
                     <property name="row_spacing">6</property>
                     <child>
@@ -220,6 +238,7 @@
                         <property name="label" translatable="yes">Highlight current _line</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -233,6 +252,7 @@
                         <property name="label" translatable="yes">Highlight matching _brackets</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -261,6 +281,7 @@
         <child type="tab">
           <object class="GtkLabel" id="label853">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="label" translatable="yes">View</property>
           </object>
           <packing>
@@ -270,15 +291,18 @@
         <child>
           <object class="GtkGrid" id="grid11">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">12</property>
             <property name="row_spacing">18</property>
             <child>
               <object class="GtkGrid" id="grid7">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label846">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Tab Stops</property>
                     <attributes>
@@ -294,12 +318,14 @@
                   <object class="GtkGrid" id="grid8">
                     <property name="name">12</property>
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="margin_start">12</property>
                     <property name="row_spacing">6</property>
                     <property name="column_spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="label98">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="halign">start</property>
                         <property name="label" translatable="yes">_Tab width:</property>
                         <property name="use_underline">True</property>
@@ -333,6 +359,7 @@
                         <property name="label" translatable="yes">Insert _spaces instead of tabs</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -347,6 +374,7 @@
                         <property name="label" translatable="yes">_Enable automatic indentation</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -371,10 +399,12 @@
             <child>
               <object class="GtkGrid" id="grid9">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label859">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">File Saving</property>
                     <attributes>
@@ -389,6 +419,7 @@
                 <child>
                   <object class="GtkGrid" id="grid10">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="margin_start">12</property>
                     <property name="row_spacing">6</property>
                     <property name="column_spacing">6</property>
@@ -397,6 +428,7 @@
                         <property name="label" translatable="yes">Create a _backup copy of files before 
saving</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -411,6 +443,7 @@
                         <property name="label" translatable="yes">_Autosave files every</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
@@ -422,6 +455,7 @@
                     <child>
                       <object class="GtkLabel" id="label97">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">_minutes</property>
                         <property name="use_underline">True</property>
                         <property name="justify">center</property>
@@ -468,6 +502,7 @@
         <child type="tab">
           <object class="GtkLabel" id="label829">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Editor</property>
           </object>
           <packing>
@@ -478,15 +513,18 @@
         <child>
           <object class="GtkGrid" id="grid16">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">12</property>
             <property name="row_spacing">18</property>
             <child>
               <object class="GtkGrid" id="grid12">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label819">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Font</property>
                     <attributes>
@@ -501,6 +539,7 @@
                 <child>
                   <object class="GtkGrid" id="grid13">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="margin_start">12</property>
                     <property name="row_spacing">6</property>
                     <property name="column_spacing">6</property>
@@ -509,6 +548,7 @@
                         <property name="label">_Use the system fixed width font (%s)</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                         <accessibility>
@@ -523,10 +563,12 @@
                     <child>
                       <object class="GtkGrid" id="font_grid">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="column_spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="font_label">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Editor _font: </property>
                             <property name="use_underline">True</property>
@@ -577,12 +619,14 @@
             <child>
               <object class="GtkGrid" id="grid14">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="hexpand">True</property>
                 <property name="vexpand">True</property>
                 <property name="row_spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label798">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Color Scheme</property>
                     <attributes>
@@ -597,6 +641,7 @@
                 <child>
                   <object class="GtkGrid" id="grid15">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="vexpand">True</property>
                     <child>
@@ -622,11 +667,13 @@
                     <child>
                       <object class="GtkToolbar" id="schemes_toolbar">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="toolbar_style">icons</property>
                         <property name="icon_size">1</property>
                         <child>
                           <object class="GtkToolButton" id="install_scheme_button">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="has_tooltip">True</property>
                             <property name="tooltip_markup" translatable="yes">Install scheme</property>
                             <property name="tooltip_text" translatable="yes">Install scheme</property>
@@ -635,12 +682,14 @@
                             <property name="icon_name">list-add-symbolic</property>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="homogeneous">True</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkToolButton" id="uninstall_scheme_button">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="has_tooltip">True</property>
                             <property name="tooltip_markup" translatable="yes">Uninstall scheme</property>
                             <property name="tooltip_text" translatable="yes">Uninstall scheme</property>
@@ -649,6 +698,7 @@
                             <property name="icon_name">list-remove-symbolic</property>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="homogeneous">True</property>
                           </packing>
                         </child>
@@ -682,6 +732,7 @@
         <child type="tab">
           <object class="GtkLabel" id="label830">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Font &amp; Colors</property>
           </object>
           <packing>
@@ -706,6 +757,7 @@
         <child type="tab">
           <object class="GtkLabel" id="label868">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Plugins</property>
           </object>
           <packing>
diff --git a/gedit/resources/ui/gedit-print-preferences.ui b/gedit/resources/ui/gedit-print-preferences.ui
index 8928b6d..f95c4ec 100644
--- a/gedit/resources/ui/gedit-print-preferences.ui
+++ b/gedit/resources/ui/gedit-print-preferences.ui
@@ -11,25 +11,30 @@
   </object>
   <object class="GtkWindow" id="window1">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="title" translatable="yes">window1</property>
     <child>
       <object class="GtkBox" id="contents">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="border_width">12</property>
         <property name="spacing">18</property>
         <child>
           <object class="GtkBox" id="vbox20">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <property name="spacing">18</property>
             <child>
               <object class="GtkBox" id="vbox26">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label33">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Syntax Highlighting</property>
                     <attributes>
@@ -37,7 +42,9 @@
                     </attributes>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -46,24 +53,34 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="margin_start">12</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkBox" id="vbox22">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label27">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Line Numbers</property>
                     <attributes>
@@ -71,12 +88,15 @@
                     </attributes>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="vbox2">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="margin_start">12</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
@@ -86,27 +106,34 @@
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkBox" id="line_numbers_hbox">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0.47999998927116394</property>
                             <property name="label" translatable="yes" comments="'Number every' from 'Number 
every 3 lines' in the 'Text Editor' tab of the print preferences.">_Number every</property>
                             <property name="use_underline">True</property>
                             <property name="mnemonic_widget">line_numbers_spinbutton</property>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                         <child>
@@ -118,6 +145,7 @@
                             <property name="value">1</property>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="fill">False</property>
                             <property name="position">1</property>
                           </packing>
@@ -125,37 +153,46 @@
                         <child>
                           <object class="GtkLabel" id="label4">
                             <property name="visible">True</property>
-                            <property name="label" translatable="yes" comments="&apos;lines&apos; from 
&apos;Number every 3 lines&apos; in the &apos;Text Editor&apos; tab of the print 
preferences.">lines</property>
+                            <property name="can_focus">False</property>
+                            <property name="label" translatable="yes" comments="'lines' from 'Number every 3 
lines' in the 'Text Editor' tab of the print preferences.">lines</property>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="fill">False</property>
                             <property name="position">2</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
                         <property name="fill">False</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkBox" id="vbox24">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label31">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Text Wrapping</property>
                     <attributes>
@@ -163,12 +200,15 @@
                     </attributes>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="vbox25">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="margin_start">12</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">6</property>
@@ -178,41 +218,53 @@
                         <property name="use_action_appearance">False</property>
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="receives_default">False</property>
                         <property name="use_underline">True</property>
                         <property name="draw_indicator">True</property>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkBox" id="hbox20">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <child>
                           <object class="GtkCheckButton" id="do_not_split_checkbutton">
                             <property name="label" translatable="yes">Do not _split words over two 
lines</property>
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                             <property name="draw_indicator">True</property>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
+                <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
@@ -220,11 +272,13 @@
             <child>
               <object class="GtkBox" id="vbox39">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label45">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Page header</property>
                     <attributes>
@@ -232,7 +286,9 @@
                     </attributes>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -241,34 +297,47 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="margin_start">12</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">3</property>
               </packing>
             </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
         </child>
         <child>
           <object class="GtkBox" id="vbox36">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <property name="spacing">18</property>
             <child>
               <object class="GtkBox" id="vbox37">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkLabel" id="label43">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Fonts</property>
                     <attributes>
@@ -276,23 +345,28 @@
                     </attributes>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="vbox4">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="margin_start">12</property>
                     <property name="orientation">vertical</property>
                     <property name="spacing">12</property>
                     <child>
                       <object class="GtkGrid" id="fonts_grid">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="row_spacing">12</property>
                         <property name="column_spacing">12</property>
                         <child>
                           <object class="GtkLabel" id="body_font_label">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Body:</property>
                             <property name="use_underline">True</property>
@@ -310,7 +384,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="font">Sans 12</property>
-                            <property name="preview_text"></property>
+                            <property name="preview_text"/>
                             <property name="show_preview_entry">False</property>
                             <property name="use_font">True</property>
                             <property name="show_style">False</property>
@@ -323,6 +397,7 @@
                         <child>
                           <object class="GtkLabel" id="numbers_font_label">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Line numbers:</property>
                             <property name="use_underline">True</property>
@@ -340,7 +415,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="font">Sans 12</property>
-                            <property name="preview_text"></property>
+                            <property name="preview_text"/>
                             <property name="show_preview_entry">False</property>
                             <property name="use_font">True</property>
                             <property name="show_style">False</property>
@@ -353,6 +428,7 @@
                         <child>
                           <object class="GtkLabel" id="headers_font_label">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">He_aders and footers:</property>
                             <property name="use_underline">True</property>
@@ -370,7 +446,7 @@
                             <property name="can_focus">True</property>
                             <property name="receives_default">True</property>
                             <property name="font">Sans 12</property>
-                            <property name="preview_text"></property>
+                            <property name="preview_text"/>
                             <property name="show_preview_entry">False</property>
                             <property name="use_font">True</property>
                             <property name="show_style">False</property>
@@ -381,10 +457,16 @@
                           </packing>
                         </child>
                       </object>
+                      <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
+                        <property name="position">0</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkButtonBox" id="hbuttonbox1">
                         <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="layout_style">end</property>
                         <child>
@@ -393,26 +475,39 @@
                             <property name="use_action_appearance">False</property>
                             <property name="visible">True</property>
                             <property name="can_focus">True</property>
+                            <property name="receives_default">False</property>
                             <property name="use_underline">True</property>
                           </object>
                           <packing>
+                            <property name="expand">False</property>
                             <property name="fill">False</property>
+                            <property name="position">0</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
             <property name="fill">False</property>
             <property name="position">1</property>
           </packing>
diff --git a/gedit/resources/ui/gedit-print-preview.ui b/gedit/resources/ui/gedit-print-preview.ui
index 83bc8a2..9745fea 100644
--- a/gedit/resources/ui/gedit-print-preview.ui
+++ b/gedit/resources/ui/gedit-print-preview.ui
@@ -9,9 +9,15 @@
     <child>
       <object class="GtkToolbar" id="toolbar1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="has_focus">False</property>
+        <property name="is_focus">False</property>
+        <property name="toolbar_style">both-horiz</property>
         <child>
           <object class="GtkToolItem" id="toolbutton1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="vexpand">False</property>
             <property name="valign">center</property>
             <property name="margin-end">2</property>
             <style>
@@ -20,6 +26,7 @@
             <child>
               <object class="GtkBox" id="box1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkButton" id="prev_button">
                     <property name="visible">True</property>
@@ -29,7 +36,9 @@
                     <property name="image">previous_image</property>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -41,6 +50,7 @@
                     <property name="image">next_image</property>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
@@ -51,27 +61,43 @@
               </object>
             </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="homogeneous">False</property>
+          </packing>
         </child>
         <child>
           <object class="GtkSeparatorToolItem" id="toolseparator1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="has_focus">False</property>
+            <property name="is_focus">False</property>
           </object>
           <packing>
+            <property name="expand">False</property>
             <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolItem" id="toolbutton2">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="has_focus">False</property>
+            <property name="is_focus">False</property>
             <child>
               <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="has_focus">False</property>
+                <property name="is_focus">False</property>
                 <property name="valign">center</property>
                 <property name="column_spacing">4</property>
                 <child>
                   <object class="GtkEntry" id="page_entry">
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="has_focus">False</property>
+                    <property name="is_focus">False</property>
                     <property name="max_length">6</property>
                     <property name="width_chars">3</property>
                     <property name="primary_icon_tooltip_text" translatable="yes">Current page 
(Alt+P)</property>
@@ -79,21 +105,31 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="label1">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="has_focus">False</property>
+                    <property name="is_focus">False</property>
                     <property name="label" translatable="yes" comments="the &quot;of&quot; from &quot;1 of 
19&quot; in print preview">of</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">0</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="last_page_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="has_focus">False</property>
+                    <property name="is_focus">False</property>
                     <child internal-child="accessible">
                       <object class="AtkObject" id="last-atkobject">
                         <property name="AtkObject::accessible-name" translatable="yes">Page total</property>
@@ -104,23 +140,35 @@
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">0</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
               </object>
             </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="homogeneous">False</property>
+          </packing>
         </child>
         <child>
           <object class="GtkSeparatorToolItem" id="toolseparator2">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="has_focus">False</property>
+            <property name="is_focus">False</property>
           </object>
           <packing>
+            <property name="expand">False</property>
             <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolItem" id="toolbutton3">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="vexpand">False</property>
             <property name="valign">center</property>
             <property name="margin-end">2</property>
             <style>
@@ -129,6 +177,7 @@
             <child>
               <object class="GtkBox" id="box2">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkButton" id="multi_pages_button">
                     <property name="visible">True</property>
@@ -138,24 +187,36 @@
                     <property name="image">multi_image</property>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
               </object>
             </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="homogeneous">False</property>
+          </packing>
         </child>
         <child>
           <object class="GtkSeparatorToolItem" id="toolseparator3">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="has_focus">False</property>
+            <property name="is_focus">False</property>
           </object>
           <packing>
+            <property name="expand">False</property>
             <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolItem" id="toolbutton4">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="vexpand">False</property>
             <property name="valign">center</property>
             <property name="margin-end">2</property>
             <style>
@@ -164,6 +225,7 @@
             <child>
               <object class="GtkBox" id="box3">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkButton" id="zoom_one_button">
                     <property name="visible">True</property>
@@ -173,7 +235,9 @@
                     <property name="image">zoom_one_image</property>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -185,6 +249,7 @@
                     <property name="image">zoom_fit_image</property>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
@@ -198,6 +263,7 @@
                     <property name="image">zoom_in_image</property>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">2</property>
                   </packing>
@@ -211,6 +277,7 @@
                     <property name="image">zoom_out_image</property>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">3</property>
                   </packing>
@@ -221,18 +288,28 @@
               </object>
             </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="homogeneous">False</property>
+          </packing>
         </child>
         <child>
           <object class="GtkSeparatorToolItem" id="toolseparator4">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="has_focus">False</property>
+            <property name="is_focus">False</property>
           </object>
           <packing>
+            <property name="expand">False</property>
             <property name="homogeneous">True</property>
           </packing>
         </child>
         <child>
           <object class="GtkToolItem" id="toolbutton5">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="vexpand">False</property>
             <property name="valign">center</property>
             <property name="margin-end">2</property>
             <style>
@@ -241,6 +318,7 @@
             <child>
               <object class="GtkBox" id="box4">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkButton" id="close_button">
                     <property name="visible">True</property>
@@ -250,12 +328,18 @@
                     <property name="use_underline">True</property>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
               </object>
             </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="homogeneous">False</property>
+          </packing>
         </child>
         <style>
           <class name="inline-toolbar"/>
@@ -272,6 +356,8 @@
       <object class="GtkScrolledWindow" id="scrolledwindow1">
         <property name="visible">True</property>
         <property name="can_focus">True</property>
+        <property name="has_focus">False</property>
+        <property name="is_focus">False</property>
         <property name="hexpand">True</property>
         <property name="vexpand">True</property>
         <property name="shadow_type">in</property>
@@ -279,6 +365,8 @@
           <object class="GtkLayout" id="layout">
             <property name="visible">True</property>
             <property name="can_focus">True</property>
+            <property name="has_focus">False</property>
+            <property name="is_focus">False</property>
             <property name="has_tooltip">True</property>
             <property name="events">GDK_POINTER_MOTION_MASK | GDK_BUTTON_PRESS_MASK | GDK_KEY_PRESS_MASK | 
GDK_STRUCTURE_MASK</property>
             <child internal-child="accessible">
diff --git a/gedit/resources/ui/gedit-progress-info-bar.ui b/gedit/resources/ui/gedit-progress-info-bar.ui
index b810fc1..3f733e4 100644
--- a/gedit/resources/ui/gedit-progress-info-bar.ui
+++ b/gedit/resources/ui/gedit-progress-info-bar.ui
@@ -7,43 +7,60 @@
     <property name="message_type">other</property>
     <child internal-child="content_area">
       <object class="GtkBox" id="infobar-content_area1">
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkBox" id="box1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="spacing">4</property>
             <child>
               <object class="GtkImage" id="image">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="icon-size">2</property>
                 <property name="icon_name">image-missing</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="padding">4</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="halign">start</property>
                 <property name="label">label</property>
                 <property name="use_markup">True</property>
                 <property name="ellipsize">end</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
         </child>
         <child>
           <object class="GtkProgressBar" id="progress">
             <property name="height_request">15</property>
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="hexpand">True</property>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
@@ -55,7 +72,12 @@
       </packing>
     </child>
     <child internal-child="action_area">
-      <object class="GtkButtonBox" id="infobar-action_area1"/>
+      <object class="GtkButtonBox" id="infobar-action_area1">
+        <property name="can_focus">False</property>
+        <child>
+          <placeholder/>
+        </child>
+      </object>
       <packing>
         <property name="expand">False</property>
         <property name="fill">True</property>
diff --git a/gedit/resources/ui/gedit-replace-dialog.ui b/gedit/resources/ui/gedit-replace-dialog.ui
index 7b8c838..77e430e 100644
--- a/gedit/resources/ui/gedit-replace-dialog.ui
+++ b/gedit/resources/ui/gedit-replace-dialog.ui
@@ -11,22 +11,27 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkButton" id="close_button">
                 <property name="label" translatable="yes">_Close</property>
                 <property name="use_action_appearance">False</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
+                <property name="receives_default">False</property>
                 <property name="no_show_all">True</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
@@ -36,9 +41,11 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
@@ -50,9 +57,11 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">2</property>
               </packing>
@@ -64,28 +73,34 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">3</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
             <property name="fill">False</property>
             <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkGrid" id="grid">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">5</property>
             <property name="row_spacing">12</property>
             <property name="column_spacing">12</property>
             <child>
               <object class="GtkLabel" id="search_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">1</property>
                 <property name="label" translatable="yes" context="label on the left of the GtkEntry 
containing text to search">F_ind </property>
                 <property name="use_underline">True</property>
@@ -93,11 +108,14 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="replace_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">1</property>
                 <property name="label" translatable="yes">Replace _with </property>
                 <property name="use_underline">True</property>
@@ -105,11 +123,14 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">1</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkGrid" id="checkbox_grid">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="row_spacing">4</property>
                 <property name="column_spacing">12</property>
                 <child>
@@ -118,12 +139,15 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -132,12 +156,15 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">1</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -146,12 +173,15 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">2</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -160,12 +190,15 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">0</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -174,6 +207,7 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="use_underline">True</property>
                     <property name="active">True</property>
                     <property name="draw_indicator">True</property>
@@ -181,16 +215,22 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">1</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">3</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/gedit/resources/ui/gedit-status-menu-button.ui b/gedit/resources/ui/gedit-status-menu-button.ui
index c17765d..54ae28f 100644
--- a/gedit/resources/ui/gedit-status-menu-button.ui
+++ b/gedit/resources/ui/gedit-status-menu-button.ui
@@ -12,15 +12,26 @@
     <child>
       <object class="GtkBox" id="box1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="has_focus">False</property>
+        <property name="is_focus">False</property>
         <property name="spacing">3</property>
         <child>
           <object class="GtkLabel" id="label">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
+            <property name="has_focus">False</property>
+            <property name="is_focus">False</property>
             <property name="halign">start</property>
             <property name="valign">baseline</property>
             <property name="label">label</property>
             <property name="single_line_mode">True</property>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
         </child>
         <child>
           <object class="GtkImage" id="arrow">
@@ -29,6 +40,8 @@
             <property name="icon_name">pan-down-symbolic</property>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/gedit/resources/ui/gedit-statusbar.ui b/gedit/resources/ui/gedit-statusbar.ui
index 3bc9335..7e4242a 100644
--- a/gedit/resources/ui/gedit-statusbar.ui
+++ b/gedit/resources/ui/gedit-statusbar.ui
@@ -9,10 +9,14 @@
     <property name="margin_start">0</property>
     <child>
       <object class="GtkFrame" id="error_frame">
+        <property name="visible">False</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
         <property name="shadow_type">in</property>
         <child>
           <object class="GtkImage" id="error_image">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="icon_name">dialog-error-symbolic</property>
             <property name="icon_size">1</property>
           </object>
@@ -26,31 +30,50 @@
     </child>
     <child>
       <object class="GtkFrame" id="state_frame">
+        <property name="visible">False</property>
+        <property name="can_focus">False</property>
+        <property name="label_xalign">0</property>
         <property name="shadow_type">in</property>
         <child>
           <object class="GtkBox" id="box1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkImage" id="load_image">
+                <property name="visible">False</property>
+                <property name="can_focus">False</property>
                 <property name="icon_name">document-open-symbolic</property>
                 <property name="icon_size">1</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkImage" id="save_image">
+                <property name="visible">False</property>
+                <property name="can_focus">False</property>
                 <property name="icon_name">document-save-symbolic</property>
                 <property name="icon_size">1</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkImage" id="print_image">
+                <property name="visible">False</property>
+                <property name="can_focus">False</property>
                 <property name="icon_name">printer-printing-symbolic</property>
                 <property name="icon_size">1</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">2</property>
               </packing>
             </child>
@@ -66,6 +89,7 @@
     <child>
       <object class="GtkLabel" id="overwrite_mode_label">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
       </object>
       <packing>
         <property name="expand">False</property>
diff --git a/gedit/resources/ui/gedit-tab-label.ui b/gedit/resources/ui/gedit-tab-label.ui
index e202242..2ccf0a8 100644
--- a/gedit/resources/ui/gedit-tab-label.ui
+++ b/gedit/resources/ui/gedit-tab-label.ui
@@ -11,13 +11,17 @@
       </object>
     </child>
     <child>
-      <object class="GtkImage" id="icon"/>
+      <object class="GtkImage" id="icon">
+        <property name="visible">False</property>
+      </object>
       <packing>
         <property name="pack_type">start</property>
       </packing>
     </child>
     <child>
-      <object class="GtkSpinner" id="spinner"/>
+      <object class="GtkSpinner" id="spinner">
+        <property name="visible">False</property>
+      </object>
       <packing>
         <property name="pack_type">start</property>
       </packing>
diff --git a/gedit/resources/ui/gedit-view-frame.ui b/gedit/resources/ui/gedit-view-frame.ui
index 26f7af8..ec9f38b 100644
--- a/gedit/resources/ui/gedit-view-frame.ui
+++ b/gedit/resources/ui/gedit-view-frame.ui
@@ -41,17 +41,21 @@
     <child type="overlay">
       <object class="GtkRevealer" id="revealer">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="halign">end</property>
         <property name="valign">start</property>
         <child>
           <object class="GtkFrame" id="frame">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <style>
               <class name="gedit-search-slider"/>
             </style>
             <child>
               <object class="GtkBox" id="hbox">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="orientation">horizontal</property>
                 <style>
                   <class name="linked"/>
                 </style>
@@ -66,9 +70,11 @@
                 <child>
                   <object class="GtkButton" id="go_up_button">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImage" id="up_image">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="icon_size">1</property>
                         <property name="icon_name">go-up-symbolic</property>
                       </object>
@@ -78,9 +84,11 @@
                 <child>
                   <object class="GtkButton" id="go_down_button">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkImage" id="down_image">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="icon_size">1</property>
                         <property name="icon_name">go-down-symbolic</property>
                       </object>
diff --git a/gedit/resources/ui/gedit-window.ui b/gedit/resources/ui/gedit-window.ui
index 147f2f1..cac2005 100644
--- a/gedit/resources/ui/gedit-window.ui
+++ b/gedit/resources/ui/gedit-window.ui
@@ -15,6 +15,7 @@
         <child>
           <object class="GtkHeaderBar" id="side_headerbar">
             <property name="visible" bind-source="side_panel" bind-property="visible" 
bind-flags="sync-create"/>
+            <property name="show_close_button">False</property>
             <property name="title" translatable="yes">Documents</property>
             <style>
               <class name="gedit-titlebar-left"/>
@@ -38,6 +39,7 @@
                 <property name="visible">True</property>
                 <property name="tooltip_text" translatable="yes">Open a file</property>
                 <property name="valign">center</property>
+                <property name="use_popover">True</property>
                 <style>
                   <class name="text-button"/>
                   <class name="image-button"/>
@@ -45,6 +47,9 @@
                 <child>
                   <object class="GtkBox" id="open_button_box">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
+                    <property name="has_focus">False</property>
+                    <property name="is_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="open_button_name">
@@ -70,12 +75,16 @@
                   </object>
                 </child>
               </object>
+              <packing>
+                <property name="pack_type">start</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="new_button">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
+                <property name="receives_default">False</property>
                 <property name="tooltip_text" translatable="yes">Create a new document</property>
                 <property name="valign">center</property>
                 <property name="action_name">win.new-tab</property>
@@ -92,6 +101,7 @@
               <object class="GtkMenuButton" id="gear_button">
                 <property name="visible">True</property>
                 <property name="valign">center</property>
+                <property name="use_popover">True</property>
                 <property name="image">menu_image</property>
               </object>
               <packing>
@@ -127,6 +137,9 @@
     <child>
       <object class="GtkOverlay" id="fullscreen_overlay">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="has_focus">False</property>
+        <property name="is_focus">False</property>
         <child>
           <object class="GtkBox" id="main_box">
             <property name="visible">True</property>
@@ -135,6 +148,8 @@
               <object class="GtkPaned" id="hpaned">
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="has_focus">False</property>
+                <property name="is_focus">False</property>
                 <style>
                   <class name="gedit-side-panel-paned"/>
                 </style>
@@ -151,13 +166,18 @@
                         </style>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
-                      <object class="GtkStack" id="side_panel"/>
+                      <object class="GtkStack" id="side_panel">
+                        <property name="visible">False</property>
+                      </object>
                       <packing>
                         <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
@@ -175,6 +195,8 @@
                       <object class="GtkPaned" id="vpaned">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
+                        <property name="has_focus">False</property>
+                        <property name="is_focus">False</property>
                         <property name="orientation">vertical</property>
                         <style>
                           <class name="gedit-bottom-panel-paned"/>
@@ -184,12 +206,14 @@
                             <property name="visible">True</property>
                           </object>
                           <packing>
+                            <property name="resize">True</property>
                             <property name="shrink">False</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="bottom_panel_box">
                             <property name="visible" bind-source="bottom_panel" bind-property="visible" 
bind-flags="sync-create"/>
+                            <property name="orientation">horizontal</property>
                             <style>
                               <class name="gedit-bottom-panel"/>
                             </style>
@@ -198,9 +222,12 @@
                                 <property name="visible">True</property>
                                 <property name="orientation">vertical</property>
                                 <child>
-                                  <object class="GtkStack" id="bottom_panel"/>
+                                  <object class="GtkStack" id="bottom_panel">
+                                    <property name="visible">False</property>
+                                  </object>
                                   <packing>
                                     <property name="expand">True</property>
+                                    <property name="fill">True</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
@@ -213,6 +240,7 @@
                                     </style>
                                   </object>
                                   <packing>
+                                    <property name="expand">False</property>
                                     <property name="fill">False</property>
                                     <property name="position">2</property>
                                   </packing>
@@ -220,6 +248,7 @@
                               </object>
                               <packing>
                                 <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -235,12 +264,14 @@
                                     <property name="action_name">win.bottom-panel</property>
                                   </object>
                                   <packing>
+                                    <property name="expand">False</property>
                                     <property name="fill">False</property>
                                     <property name="position">1</property>
                                   </packing>
                                 </child>
                               </object>
                               <packing>
+                                <property name="expand">False</property>
                                 <property name="fill">False</property>
                                 <property name="position">2</property>
                               </packing>
@@ -254,6 +285,7 @@
                       </object>
                       <packing>
                         <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">2</property>
                       </packing>
                     </child>
@@ -267,6 +299,7 @@
                             <child internal-child="label">
                               <object class="GtkLabel">
                                 <property name="width_chars">18</property>
+                                <property name="can_focus">False</property>
                               </object>
                             </child>
                           </object>
@@ -300,14 +333,21 @@
                         </child>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="resize">True</property>
+                    <property name="shrink">True</property>
+                  </packing>
                 </child>
               </object>
               <packing>
                 <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -316,10 +356,13 @@
         <child type="overlay">
           <object class="GtkEventBox" id="fullscreen_eventbox">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="valign">start</property>
             <child>
               <object class="GtkRevealer" id="fullscreen_controls">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="reveal_child">False</property>
                 <property name="valign">start</property>
                 <child>
                   <object class="GtkHeaderBar" id="fullscreen_headerbar">
@@ -329,6 +372,7 @@
                         <property name="visible">True</property>
                         <property name="tooltip_text" translatable="yes">Open a file dialog</property>
                         <property name="valign">center</property>
+                        <property name="use_popover">True</property>
                         <style>
                           <class name="text-button"/>
                           <class name="image-button"/>
@@ -336,6 +380,9 @@
                         <child>
                           <object class="GtkBox" id="fullscreen_open_button_box">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
+                            <property name="has_focus">False</property>
+                            <property name="is_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkLabel" id="fullscreen_open_button_name">
@@ -358,12 +405,16 @@
                           </object>
                         </child>
                       </object>
+                      <packing>
+                        <property name="pack_type">start</property>
+                      </packing>
                     </child>
                     <child>
                       <object class="GtkButton" id="fullscreen_new_button">
                         <property name="visible">True</property>
                         <property name="can_focus">True</property>
                         <property name="can_default">True</property>
+                        <property name="receives_default">False</property>
                         <property name="tooltip_text" translatable="yes">Create a new document</property>
                         <property name="valign">center</property>
                         <property name="action_name">win.new-tab</property>
@@ -452,6 +503,7 @@
     <property name="icon_name">view-restore-symbolic</property>
   </object>
   <object class="GtkSizeGroup">
+    <property name="mode">horizontal</property>
     <widgets>
       <widget name="side_headerbar"/>
       <widget name="side_panel"/>
@@ -464,6 +516,7 @@
       <widget name="open_button"/>
       <widget name="gear_button"/>
       <widget name="save_button"/>
+      <widget name="open_button"/>
     </widgets>
   </object>
   <object class="GtkSizeGroup">
@@ -473,7 +526,9 @@
       <widget name="fullscreen_open_button"/>
       <widget name="fullscreen_gear_button"/>
       <widget name="fullscreen_save_button"/>
+      <widget name="fullscreen_open_button"/>
       <widget name="leave_fullscreen_button"/>
     </widgets>
   </object>
 </interface>
+
diff --git a/plugins/docinfo/resources/ui/gedit-docinfo-plugin.ui 
b/plugins/docinfo/resources/ui/gedit-docinfo-plugin.ui
index bb9af4c..84cf918 100644
--- a/plugins/docinfo/resources/ui/gedit-docinfo-plugin.ui
+++ b/plugins/docinfo/resources/ui/gedit-docinfo-plugin.ui
@@ -2,6 +2,7 @@
 <interface>
   <requires lib="gtk+" version="2.16"/>
   <object class="GtkDialog" id="dialog">
+    <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Document Statistics</property>
     <property name="resizable">False</property>
@@ -11,6 +12,7 @@
       <object class="GtkHeaderBar" id="header_bar">
         <property name="title" translatable="yes">Document Statistics</property>
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="show-close-button">True</property>
         <child>
           <object class="GtkButton" id="update_button">
@@ -29,28 +31,35 @@
               </object>
             </child>
           </object>
+          <packing>
+            <property name="pack_type">start</property>
+          </packing>
         </child>
-      </object>
+       </object>
     </child>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">8</property>
         <child>
           <object class="GtkBox" id="docinfo_dialog_content">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">5</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkGrid" id="grid_table">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="row_spacing">6</property>
                 <property name="column_spacing">18</property>
                 <child>
                   <object class="GtkLabel" id="document_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Document</property>
                     <property name="use_markup">True</property>
@@ -61,11 +70,14 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">0</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="selection_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Selection</property>
                     <property name="selectable">True</property>
@@ -73,11 +85,14 @@
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">0</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="lines_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Lines</property>
                     <property name="selectable">True</property>
@@ -85,11 +100,14 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">1</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="words_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Words</property>
                     <property name="selectable">True</property>
@@ -97,11 +115,14 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">2</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="chars_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Characters (with spaces)</property>
                     <property name="selectable">True</property>
@@ -109,11 +130,14 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">3</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="chars_ns_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Characters (no spaces)</property>
                     <property name="selectable">True</property>
@@ -121,11 +145,14 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">4</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="bytes_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Bytes</property>
                     <property name="selectable">True</property>
@@ -133,11 +160,14 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">5</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="document_lines_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label">0</property>
                     <property name="selectable">True</property>
@@ -145,11 +175,14 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">1</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="document_words_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label">0</property>
                     <property name="selectable">True</property>
@@ -157,11 +190,14 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">2</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="document_chars_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label">0</property>
                     <property name="selectable">True</property>
@@ -169,11 +205,14 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">3</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="document_chars_ns_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label">0</property>
                     <property name="selectable">True</property>
@@ -181,11 +220,14 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">4</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="document_bytes_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label">0</property>
                     <property name="selectable">True</property>
@@ -193,11 +235,14 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">5</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="selected_lines_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label">0</property>
                     <property name="selectable">True</property>
@@ -205,11 +250,14 @@
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">1</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="selected_words_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label">0</property>
                     <property name="selectable">True</property>
@@ -217,11 +265,14 @@
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">2</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="selected_chars_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label">0</property>
                     <property name="selectable">True</property>
@@ -229,11 +280,14 @@
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">3</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="selected_chars_ns_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label">0</property>
                     <property name="selectable">True</property>
@@ -241,11 +295,14 @@
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">4</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="selected_bytes_label">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">1</property>
                     <property name="label">0</property>
                     <property name="selectable">True</property>
@@ -253,15 +310,21 @@
                   <packing>
                     <property name="left_attach">2</property>
                     <property name="top_attach">5</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/plugins/externaltools/tools/outputpanel.ui b/plugins/externaltools/tools/outputpanel.ui
index 44f8381..4c163c2 100644
--- a/plugins/externaltools/tools/outputpanel.ui
+++ b/plugins/externaltools/tools/outputpanel.ui
@@ -3,6 +3,7 @@
   <!-- interface-requires gtk+ 3.6 -->
   <object class="GtkOverlay" id="output-panel">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <child>
       <object class="GtkScrolledWindow" id="scrolledwindow1">
         <property name="visible">True</property>
@@ -38,6 +39,7 @@
         <child>
           <object class="GtkImage" id="image1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="icon_name">process-stop-symbolic</property>
           </object>
         </child>
diff --git a/plugins/externaltools/tools/tools.ui b/plugins/externaltools/tools/tools.ui
index 5ceed1b..a3f0ab1 100644
--- a/plugins/externaltools/tools/tools.ui
+++ b/plugins/externaltools/tools/tools.ui
@@ -132,6 +132,7 @@
     </data>
   </object>
   <object class="GtkWindow" id="tool-manager-dialog">
+    <property name="can_focus">False</property>
     <property name="title" translatable="yes">Manage External Tools</property>
     <property name="default_width">800</property>
     <property name="default_height">600</property>
@@ -159,6 +160,7 @@
         <child>
           <object class="GtkBox" id="vbox2">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkScrolledWindow" id="scrolled_window1">
@@ -182,11 +184,14 @@
               </object>
               <packing>
                 <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkToolbar" id="toolbar1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="toolbar_style">icons</property>
                 <style>
                   <class name="inline-toolbar"/>
@@ -195,6 +200,7 @@
                 <child>
                   <object class="GtkToolButton" id="add-tool-button">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Add a new tool</property>
                     <property name="label" translatable="yes">Add Tool</property>
                     <property name="use_underline">True</property>
@@ -202,12 +208,14 @@
                     <signal name="clicked" handler="on_add_tool_button_clicked" swapped="no"/>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkToolButton" id="remove-tool-button">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Remove selected tool</property>
                     <property name="label" translatable="yes">Remove Tool</property>
                     <property name="use_underline">True</property>
@@ -215,12 +223,14 @@
                     <signal name="clicked" handler="on_remove_tool_button_clicked" swapped="no"/>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkToolButton" id="revert-tool-button">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="tooltip_text" translatable="yes">Revert tool</property>
                     <property name="label" translatable="yes">Revert Tool</property>
                     <property name="use_underline">True</property>
@@ -228,11 +238,14 @@
                     <signal name="clicked" handler="on_remove_tool_button_clicked" swapped="no"/>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -245,17 +258,21 @@
         <child>
           <object class="GtkBox" id="vbox5">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <property name="spacing">6</property>
             <child>
               <object class="GtkBox" id="hbox7">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <child>
                   <object class="GtkGrid" id="grid1">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkGrid" id="tool-grid">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="margin_start">6</property>
                         <property name="margin_end">6</property>
                         <property name="margin_top">6</property>
@@ -265,6 +282,7 @@
                         <child>
                           <object class="GtkLabel" id="label3">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">Shortcut _key:</property>
                             <property name="use_underline">True</property>
@@ -274,6 +292,8 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -289,11 +309,14 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label6">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Save:</property>
                             <property name="use_underline">True</property>
@@ -302,11 +325,14 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkComboBox" id="save-files">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="model">model_save_files</property>
                             <child>
                               <object class="GtkCellRendererText" id="renderer1"/>
@@ -318,11 +344,14 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">1</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label7">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Input:</property>
                             <property name="use_underline">True</property>
@@ -331,11 +360,14 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">2</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkComboBox" id="input">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="model">model_input</property>
                             <child>
                               <object class="GtkCellRendererText" id="input_renderer"/>
@@ -347,11 +379,14 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">2</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label8">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Output:</property>
                             <property name="use_underline">True</property>
@@ -360,11 +395,14 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">3</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkComboBox" id="output">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="model">model_output</property>
                             <child>
                               <object class="GtkCellRendererText" id="output_renderer"/>
@@ -376,11 +414,14 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">3</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label23">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Applicability:</property>
                             <property name="use_underline">True</property>
@@ -389,15 +430,19 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">4</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="hbox1">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="spacing">6</property>
                             <child>
                               <object class="GtkComboBox" id="applicability">
                                 <property name="visible">True</property>
+                                <property name="can_focus">False</property>
                                 <property name="model">model_applicability</property>
                                 <signal name="changed" handler="on_applicability_changed" swapped="no"/>
                                 <child>
@@ -407,16 +452,23 @@
                                   </attributes>
                                 </child>
                               </object>
+                              <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
+                              </packing>
                             </child>
                             <child>
                               <object class="GtkButton" id="languages_button">
                                 <property name="use_action_appearance">False</property>
                                 <property name="visible">True</property>
                                 <property name="can_focus">True</property>
+                                <property name="receives_default">False</property>
                                 <signal name="clicked" handler="on_languages_button_clicked" swapped="no"/>
                                 <child>
                                   <object class="GtkLabel" id="languages_label">
                                     <property name="visible">True</property>
+                                    <property name="can_focus">False</property>
                                     <property name="xalign">0</property>
                                     <property name="label" translatable="yes">All Languages</property>
                                     <property name="ellipsize">end</property>
@@ -426,6 +478,7 @@
                               </object>
                               <packing>
                                 <property name="expand">True</property>
+                                <property name="fill">True</property>
                                 <property name="position">1</property>
                               </packing>
                             </child>
@@ -433,12 +486,16 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">4</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">1</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
                       </packing>
                     </child>
                     <child>
@@ -461,18 +518,27 @@
                       <packing>
                         <property name="left_attach">0</property>
                         <property name="top_attach">0</property>
+                        <property name="width">1</property>
+                        <property name="height">1</property>
                       </packing>
                     </child>
                   </object>
+                  <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
+                    <property name="position">0</property>
+                  </packing>
                 </child>
               </object>
               <packing>
                 <property name="expand">True</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="resize">True</property>
             <property name="shrink">False</property>
           </packing>
         </child>
diff --git a/plugins/filebrowser/resources/ui/gedit-file-browser-widget.ui 
b/plugins/filebrowser/resources/ui/gedit-file-browser-widget.ui
index 924a2ee..957d779 100644
--- a/plugins/filebrowser/resources/ui/gedit-file-browser-widget.ui
+++ b/plugins/filebrowser/resources/ui/gedit-file-browser-widget.ui
@@ -66,9 +66,11 @@
   </object>
   <object class="GtkMenu" id="location_previous_menu">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
   </object>
   <object class="GtkMenu" id="location_next_menu">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
   </object>
   <template class="GeditFileBrowserWidget" parent="GtkGrid">
     <property name="visible">True</property>
@@ -76,11 +78,13 @@
     <child>
       <object class="GtkBox" id="toolbar">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="margin">3</property>
         <property name="spacing">3</property>
         <child>
           <object class="GtkBox" id="box1">
-            <property name="visible">True</property>
+          <property name="visible">True</property>
+          <property name="can_focus">False</property>
             <child>
               <object class="GtkButton" id="previous_button">
                 <property name="visible">True</property>
@@ -105,9 +109,9 @@
                 </style>
               </object>
             </child>
-            <style>
-              <class name="linked"/>
-            </style>
+          <style>
+            <class name="linked"/>
+          </style>
           </object>
         </child>
         <child>
@@ -122,27 +126,33 @@
             </style>
           </object>
           <packing>
+            <property name="expand">False</property>
             <property name="fill">False</property>
             <property name="position">1</property>
           </packing>
         </child>
         <child>
           <object class="GtkMenuButton" id="locations_button">
-            <property name="visible">True</property>
-            <property name="valign">center</property>
-            <property name="popover">locations_popover</property>
-            <style>
-              <class name="text-button"/>
-              <class name="image-button"/>
-              <class name="small-button"/>
-            </style>
+          <property name="visible">True</property>
+          <property name="valign">center</property>
+          <property name="use_popover">True</property>
+          <property name="popover">locations_popover</property>
+          <style>
+            <class name="text-button"/>
+            <class name="image-button"/>
+            <class name="small-button"/>
+          </style>
             <child>
               <object class="GtkBox" id="locations_button_box">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
+                <property name="has_focus">False</property>
+                <property name="is_focus">False</property>
                 <property name="spacing">6</property>
                 <child>
                   <object class="GtkCellView" id="locations_cellview">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="model">locations_model</property>
                     <child>
                       <object class="GtkCellRendererPixbuf" id="cellview_icon_renderer"/>
@@ -167,7 +177,7 @@
                     <property name="icon_name">pan-down-symbolic</property>
                   </object>
                   <packing>
-                    <property name="pack-type">GTK_PACK_END</property>
+                  <property name="pack-type">GTK_PACK_END</property>
                   </packing>
                 </child>
               </object>
@@ -193,6 +203,7 @@
     </child>
     <child>
       <object class="GtkSearchEntry" id="location_entry">
+        <property name="visible">False</property>
         <property name="can_focus">True</property>
         <property name="invisible_char">●</property>
         <property name="primary_icon_name">folder-symbolic</property>
@@ -230,6 +241,8 @@
     <child>
       <object class="GtkRevealer" id="filter_entry_revealer">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
+        <property name="reveal_child">False</property>
         <property name="valign">start</property>
         <child>
           <object class="GtkEntry" id="filter_entry">
diff --git a/plugins/pythonconsole/pythonconsole/config.ui b/plugins/pythonconsole/pythonconsole/config.ui
index 23cfff1..573be34 100644
--- a/plugins/pythonconsole/pythonconsole/config.ui
+++ b/plugins/pythonconsole/pythonconsole/config.ui
@@ -3,6 +3,7 @@
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkGrid" id="grid">
     <property name="visible">True</property>
+    <property name="can_focus">False</property>
     <property name="margin_start">12</property>
     <property name="margin_end">12</property>
     <property name="margin_top">12</property>
@@ -12,6 +13,7 @@
     <child>
       <object class="GtkLabel" id="label-command">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes">C_ommand color:</property>
         <property name="use_underline">True</property>
@@ -25,6 +27,7 @@
     <child>
       <object class="GtkLabel" id="label-error">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="xalign">0</property>
         <property name="label" translatable="yes">_Error color:</property>
         <property name="use_underline">True</property>
diff --git a/plugins/snippets/snippets/snippets.ui b/plugins/snippets/snippets/snippets.ui
index 815c695..d6c7e3d 100644
--- a/plugins/snippets/snippets/snippets.ui
+++ b/plugins/snippets/snippets/snippets.ui
@@ -59,6 +59,7 @@
         <child>
           <object class="GtkBox" id="box2">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="vexpand">True</property>
             <property name="orientation">vertical</property>
             <child>
@@ -84,16 +85,20 @@
               </object>
               <packing>
                 <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkToolbar" id="toolbar">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="toolbar_style">icons</property>
                 <property name="icon_size">1</property>
                 <child>
                   <object class="GtkToolButton" id="add_snippet_button">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_markup" translatable="yes">Create new snippet</property>
                     <property name="tooltip_text" translatable="yes">Create new snippet</property>
@@ -103,12 +108,14 @@
                     <signal name="clicked" handler="on_add_snippet_button_clicked" swapped="no"/>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkToolButton" id="remove_snippet_button">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_markup" translatable="yes">Delete selected snippet</property>
                     <property name="tooltip_text" translatable="yes">Delete selected snippet</property>
@@ -118,12 +125,14 @@
                     <signal name="clicked" handler="on_remove_snippet_button_clicked" swapped="no"/>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkToolButton" id="import_snippets_button">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_markup" translatable="yes">Import snippets</property>
                     <property name="tooltip_text" translatable="yes">Import snippets</property>
@@ -133,12 +142,14 @@
                     <signal name="clicked" handler="on_import_snippets_button_clicked" swapped="no"/>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkToolButton" id="export_snippets_button">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="has_tooltip">True</property>
                     <property name="tooltip_markup" translatable="yes">Export selected snippets</property>
                     <property name="tooltip_text" translatable="yes">Export selected snippets</property>
@@ -148,6 +159,7 @@
                     <signal name="clicked" handler="on_export_snippets_button_clicked" swapped="no"/>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="homogeneous">True</property>
                   </packing>
                 </child>
@@ -156,17 +168,21 @@
                 </style>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="resize">False</property>
+            <property name="shrink">True</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="vbox_snippet">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="orientation">vertical</property>
             <child>
               <object class="GtkScrolledWindow" id="scrolled_window_snippet">
@@ -186,11 +202,14 @@
               </object>
               <packing>
                 <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkBox" id="vbox1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="margin_start">6</property>
                 <property name="margin_end">6</property>
                 <property name="margin_top">6</property>
@@ -200,6 +219,7 @@
                 <child>
                   <object class="GtkLabel" id="label3">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="xalign">0</property>
                     <property name="label" translatable="yes">Activation</property>
                     <property name="use_markup">True</property>
@@ -208,29 +228,37 @@
                     </attributes>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkBox" id="hbox1">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <child>
                       <object class="GtkLabel" id="label2">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">    </property>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
                       <object class="GtkGrid" id="grid1">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="row_spacing">6</property>
                         <property name="column_spacing">6</property>
                         <child>
                           <object class="GtkLabel" id="label_tab_trigger">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes" comments="&quot;tab&quot; here means 
the tab key, not the notebook tab!">_Tab trigger:</property>
                             <property name="use_underline">True</property>
@@ -239,11 +267,14 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkBox" id="hbox_tab_trigger">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <child>
                               <object class="GtkEntry" id="entry_tab_trigger">
                                 <property name="visible">True</property>
@@ -255,12 +286,17 @@
                               </object>
                               <packing>
                                 <property name="expand">True</property>
+                                <property name="fill">True</property>
+                                <property name="position">0</property>
                               </packing>
                             </child>
                             <child>
                               <object class="GtkImage" id="image_tab_trigger">
+                                <property name="can_focus">False</property>
                               </object>
                               <packing>
+                                <property name="expand">False</property>
+                                <property name="fill">True</property>
                                 <property name="padding">3</property>
                                 <property name="position">1</property>
                               </packing>
@@ -269,11 +305,14 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">0</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label_accelerator">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">S_hortcut key:</property>
                             <property name="use_underline">True</property>
@@ -282,6 +321,8 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">1</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
@@ -298,11 +339,14 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">1</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkLabel" id="label_drop_targets">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="xalign">0</property>
                             <property name="label" translatable="yes">_Drop targets:</property>
                             <property name="use_underline">True</property>
@@ -311,11 +355,14 @@
                           <packing>
                             <property name="left_attach">0</property>
                             <property name="top_attach">2</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                         <child>
                           <object class="GtkComboBox" id="combo_drop_targets">
                             <property name="visible">True</property>
+                            <property name="can_focus">False</property>
                             <property name="model">model1</property>
                             <property name="has_entry">True</property>
                             <child>
@@ -333,26 +380,36 @@
                           <packing>
                             <property name="left_attach">1</property>
                             <property name="top_attach">2</property>
+                            <property name="width">1</property>
+                            <property name="height">1</property>
                           </packing>
                         </child>
                       </object>
                       <packing>
                         <property name="expand">True</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
+                    <property name="fill">True</property>
                     <property name="position">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
+                <property name="expand">False</property>
                 <property name="fill">False</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
+          <packing>
+            <property name="resize">True</property>
+            <property name="shrink">True</property>
+          </packing>
         </child>
       </object>
     </child>
diff --git a/plugins/sort/resources/ui/gedit-sort-plugin.ui b/plugins/sort/resources/ui/gedit-sort-plugin.ui
index 94d4a0f..95a0e17 100644
--- a/plugins/sort/resources/ui/gedit-sort-plugin.ui
+++ b/plugins/sort/resources/ui/gedit-sort-plugin.ui
@@ -9,6 +9,7 @@
     <property name="page_increment">10</property>
   </object>
   <object class="GtkDialog" id="sort_dialog">
+    <property name="can_focus">False</property>
     <property name="title" translatable="yes">Sort</property>
     <property name="resizable">False</property>
     <property name="destroy_with_parent">True</property>
@@ -17,16 +18,19 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <child>
           <object class="GtkBox" id="vbox1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="border_width">10</property>
             <property name="orientation">vertical</property>
             <property name="spacing">18</property>
             <child>
               <object class="GtkBox" id="vbox5">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="orientation">vertical</property>
                 <property name="spacing">6</property>
                 <child>
@@ -34,12 +38,15 @@
                     <property name="label" translatable="yes">_Reverse order</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="fill">False</property>
+                    <property name="position">0</property>
                   </packing>
                 </child>
                 <child>
@@ -47,11 +54,13 @@
                     <property name="label" translatable="yes">R_emove duplicates</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">1</property>
                   </packing>
@@ -61,11 +70,13 @@
                     <property name="label" translatable="yes">C_ase sensitive</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
                     <property name="draw_indicator">True</property>
                   </object>
                   <packing>
+                    <property name="expand">False</property>
                     <property name="fill">False</property>
                     <property name="position">2</property>
                   </packing>
@@ -73,16 +84,20 @@
                 <child>
                   <object class="GtkBox" id="hbox13">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="spacing">6</property>
                     <child>
                       <object class="GtkLabel" id="label18">
                         <property name="visible">True</property>
+                        <property name="can_focus">False</property>
                         <property name="label" translatable="yes">S_tart at column:</property>
                         <property name="use_underline">True</property>
                         <property name="mnemonic_widget">col_num_spinbutton</property>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
                         <property name="fill">False</property>
+                        <property name="position">0</property>
                       </packing>
                     </child>
                     <child>
@@ -94,43 +109,49 @@
                         <property name="numeric">True</property>
                       </object>
                       <packing>
+                        <property name="expand">False</property>
+                        <property name="fill">True</property>
                         <property name="position">1</property>
                       </packing>
                     </child>
                   </object>
                   <packing>
                     <property name="expand">True</property>
+                    <property name="fill">True</property>
                     <property name="position">3</property>
                   </packing>
                 </child>
               </object>
               <packing>
                 <property name="expand">True</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </object>
           <packing>
             <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
       </object>
     </child>
-    <child type="action">
-      <object class="GtkButton" id="cancel">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">_Cancel</property>
-        <property name="use_underline">True</property>
-      </object>
-    </child>
-    <child type="action">
-      <object class="GtkButton" id="sort">
-        <property name="visible">True</property>
-        <property name="label" translatable="yes">_Sort</property>
-        <property name="can-default">True</property>
-        <property name="use_underline">True</property>
-      </object>
-    </child>
+  <child type="action">
+    <object class="GtkButton" id="cancel">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">_Cancel</property>
+      <property name="use_underline">True</property>
+    </object>
+  </child>
+  <child type="action">
+    <object class="GtkButton" id="sort">
+      <property name="visible">True</property>
+      <property name="label" translatable="yes">_Sort</property>
+      <property name="can-default">True</property>
+      <property name="use_underline">True</property>
+    </object>
+  </child>
     <action-widgets>
       <action-widget response="-6">cancel</action-widget>
       <action-widget response="-5">sort</action-widget>
diff --git a/plugins/spell/resources/ui/languages-dialog.ui b/plugins/spell/resources/ui/languages-dialog.ui
index 8b63044..6631114 100644
--- a/plugins/spell/resources/ui/languages-dialog.ui
+++ b/plugins/spell/resources/ui/languages-dialog.ui
@@ -12,11 +12,13 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">12</property>
         <child>
           <object class="GtkLabel" id="label1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="label" translatable="yes">Select the _language of the current 
document.</property>
             <property name="use_underline">True</property>
             <property name="wrap">True</property>
@@ -24,7 +26,9 @@
             <property name="xalign">0</property>
           </object>
           <packing>
+            <property name="expand">False</property>
             <property name="fill">False</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
@@ -46,6 +50,7 @@
           </object>
           <packing>
             <property name="expand">True</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/plugins/spell/resources/ui/spell-checker.ui b/plugins/spell/resources/ui/spell-checker.ui
index 9270d26..8e23c6f 100644
--- a/plugins/spell/resources/ui/spell-checker.ui
+++ b/plugins/spell/resources/ui/spell-checker.ui
@@ -11,16 +11,19 @@
     <child internal-child="vbox">
       <object class="GtkBox" id="content">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">6</property>
         <child>
           <object class="GtkGrid" id="grid1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">6</property>
             <child>
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Misspelled word:</property>
                 <property name="justify">center</property>
                 <property name="xalign">0</property>
@@ -33,6 +36,7 @@
             <child>
               <object class="GtkLabel" id="misspelled_word_label">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">word</property>
                 <property name="use_markup">True</property>
                 <property name="wrap">True</property>
@@ -49,6 +53,7 @@
             <child>
               <object class="GtkLabel" id="label3">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">Change _to:</property>
                 <property name="use_underline">True</property>
                 <property name="justify">center</property>
@@ -79,6 +84,7 @@
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -87,15 +93,22 @@
               </packing>
             </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
         </child>
         <child>
           <object class="GtkGrid" id="grid2">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="row_spacing">6</property>
             <property name="column_spacing">6</property>
             <child>
               <object class="GtkLabel" id="label4">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="label" translatable="yes">_Suggestions:</property>
                 <property name="use_underline">True</property>
                 <property name="justify">center</property>
@@ -113,6 +126,7 @@
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -126,6 +140,7 @@
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -141,6 +156,7 @@
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -155,6 +171,7 @@
                 <property name="visible">True</property>
                 <property name="sensitive">False</property>
                 <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -165,6 +182,7 @@
             <child>
               <object class="GtkLabel" id="label6">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="margin_top">6</property>
                 <property name="label" translatable="yes">User dictionary:</property>
                 <property name="use_markup">True</property>
@@ -182,6 +200,7 @@
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
@@ -214,8 +233,16 @@
                 <property name="height">4</property>
               </packing>
             </child>
+            <child>
+              <placeholder/>
+            </child>
+            <child>
+              <placeholder/>
+            </child>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>
diff --git a/plugins/time/resources/ui/gedit-time-dialog.ui b/plugins/time/resources/ui/gedit-time-dialog.ui
index da00b7c..811ad0f 100644
--- a/plugins/time/resources/ui/gedit-time-dialog.ui
+++ b/plugins/time/resources/ui/gedit-time-dialog.ui
@@ -2,24 +2,29 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="choose_format_dialog">
+    <property name="can_focus">False</property>
     <property name="border_width">5</property>
     <property name="title" translatable="yes">Insert Date and Time</property>
     <property name="destroy_with_parent">True</property>
+    <property name="type_hint">normal</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox2">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">2</property>
         <child>
           <object class="GtkGrid" id="grid1">
             <property name="border_width">10</property>
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <child>
               <object class="GtkRadioButton" id="use_sel_format_radiobutton">
                 <property name="label" translatable="yes">Use the _selected format</property>
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="active">True</property>
@@ -29,6 +34,7 @@
                 <property name="left_attach">0</property>
                 <property name="top_attach">0</property>
                 <property name="width">2</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -51,6 +57,7 @@
                 <property name="left_attach">0</property>
                 <property name="top_attach">1</property>
                 <property name="width">2</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -59,6 +66,7 @@
                 <property name="use_action_appearance">False</property>
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
+                <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
                 <property name="active">True</property>
@@ -68,6 +76,8 @@
               <packing>
                 <property name="left_attach">0</property>
                 <property name="top_attach">2</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
@@ -82,11 +92,14 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">2</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
             <child>
               <object class="GtkLabel" id="custom_format_example">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="valign">center</property>
                 <property name="hexpand">True</property>
                 <property name="xalign">1</property>
@@ -99,13 +112,21 @@
               <packing>
                 <property name="left_attach">1</property>
                 <property name="top_attach">3</property>
+                <property name="width">1</property>
+                <property name="height">1</property>
               </packing>
             </child>
           </object>
+          <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
+            <property name="position">0</property>
+          </packing>
         </child>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area2">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="help_button">
@@ -114,9 +135,15 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
+                <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
               </object>
+              <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
+                <property name="position">0</property>
+              </packing>
             </child>
             <child>
               <object class="GtkButton" id="cancel_button">
@@ -125,10 +152,13 @@
                 <property name="visible">True</property>
                 <property name="can_focus">True</property>
                 <property name="can_default">True</property>
+                <property name="receives_default">False</property>
                 <property name="use_action_appearance">False</property>
                 <property name="use_underline">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
@@ -144,12 +174,17 @@
                 <property name="use_underline">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">2</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
       </object>
diff --git a/plugins/time/resources/ui/gedit-time-setup-dialog.ui 
b/plugins/time/resources/ui/gedit-time-setup-dialog.ui
index 135cbf2..c2b14fb 100644
--- a/plugins/time/resources/ui/gedit-time-setup-dialog.ui
+++ b/plugins/time/resources/ui/gedit-time-setup-dialog.ui
@@ -2,15 +2,19 @@
 <interface>
   <!-- interface-requires gtk+ 3.0 -->
   <object class="GtkDialog" id="time_dialog">
+    <property name="can_focus">False</property>
     <property name="title" translatable="yes">Configure date/time plugin</property>
+    <property name="type_hint">normal</property>
     <child internal-child="vbox">
       <object class="GtkBox" id="dialog-vbox1">
         <property name="visible">True</property>
+        <property name="can_focus">False</property>
         <property name="orientation">vertical</property>
         <property name="spacing">8</property>
         <child internal-child="action_area">
           <object class="GtkButtonBox" id="dialog-action_area1">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="layout_style">end</property>
             <child>
               <object class="GtkButton" id="button1">
@@ -24,17 +28,23 @@
                 <property name="use_underline">True</property>
               </object>
               <packing>
+                <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="pack_type">end</property>
+            <property name="position">0</property>
           </packing>
         </child>
         <child>
           <object class="GtkBox" id="time_dialog_content">
             <property name="visible">True</property>
+            <property name="can_focus">False</property>
             <property name="vexpand">True</property>
             <property name="border_width">10</property>
             <property name="orientation">vertical</property>
@@ -42,6 +52,7 @@
             <child>
               <object class="GtkLabel" id="label1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="xalign">0</property>
                 <property name="label" translatable="yes">When inserting date/time...</property>
                 <attributes>
@@ -49,12 +60,15 @@
                 </attributes>
               </object>
               <packing>
+                <property name="expand">False</property>
                 <property name="fill">False</property>
+                <property name="position">0</property>
               </packing>
             </child>
             <child>
               <object class="GtkGrid" id="grid1">
                 <property name="visible">True</property>
+                <property name="can_focus">False</property>
                 <property name="margin_start">12</property>
                 <child>
                   <object class="GtkRadioButton" id="always_prompt">
@@ -62,6 +76,7 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
                     <property name="active">True</property>
@@ -71,6 +86,7 @@
                     <property name="left_attach">0</property>
                     <property name="top_attach">0</property>
                     <property name="width">2</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -79,6 +95,7 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
                     <property name="active">True</property>
@@ -89,6 +106,7 @@
                     <property name="left_attach">0</property>
                     <property name="top_attach">1</property>
                     <property name="width">2</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -115,6 +133,7 @@
                     <property name="left_attach">0</property>
                     <property name="top_attach">2</property>
                     <property name="width">2</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -123,6 +142,7 @@
                     <property name="use_action_appearance">False</property>
                     <property name="visible">True</property>
                     <property name="can_focus">True</property>
+                    <property name="receives_default">False</property>
                     <property name="use_action_appearance">False</property>
                     <property name="use_underline">True</property>
                     <property name="active">True</property>
@@ -132,6 +152,8 @@
                   <packing>
                     <property name="left_attach">0</property>
                     <property name="top_attach">3</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
@@ -146,11 +168,14 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">3</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
                 <child>
                   <object class="GtkLabel" id="custom_format_example">
                     <property name="visible">True</property>
+                    <property name="can_focus">False</property>
                     <property name="hexpand">True</property>
                     <property name="xalign">1</property>
                     <property name="label" translatable="yes" comments="Translators: This example should 
follow the date format defined in the entry above">01/11/2009 17:52:00</property>
@@ -162,15 +187,21 @@
                   <packing>
                     <property name="left_attach">1</property>
                     <property name="top_attach">4</property>
+                    <property name="width">1</property>
+                    <property name="height">1</property>
                   </packing>
                 </child>
               </object>
               <packing>
+                <property name="expand">False</property>
+                <property name="fill">True</property>
                 <property name="position">1</property>
               </packing>
             </child>
           </object>
           <packing>
+            <property name="expand">False</property>
+            <property name="fill">True</property>
             <property name="position">1</property>
           </packing>
         </child>



[Date Prev][Date Next]   [Thread Prev][Thread Next]   [Thread Index] [Date Index] [Author Index]