diff --git a/src/client/application/geary-application.vala b/src/client/application/geary-application.vala
index cb83a49d..48f0ea6b 100644
--- a/src/client/application/geary-application.vala
+++ b/src/client/application/geary-application.vala
@@ -224,7 +224,6 @@ public class GearyApplication : Gtk.Application {
 
         // When the app is started hidden, show_all() never gets
         // called, do so here to prevent an empty window appearing.
-        controller.main_window.show_all();
         controller.main_window.present();
 
         return true;
diff --git a/src/client/application/geary-controller.vala b/src/client/application/geary-controller.vala
index 524ce1a5..c9d34065 100644
--- a/src/client/application/geary-controller.vala
+++ b/src/client/application/geary-controller.vala
@@ -1198,7 +1198,7 @@ public class GearyController : Geary.BaseObject {
             !upgrade_dialog.visible &&
             !cancellable_open_account.is_cancelled() &&
             !Args.hidden_startup)
-            main_window.show_all();
+            main_window.show();
     }
     
     /**
@@ -1441,7 +1441,6 @@ public class GearyController : Geary.BaseObject {
     private void on_indicator_activated_application(uint32 timestamp) {
         // When the app is started hidden, show_all() never gets
         // called, do so here to prevent an empty window appearing.
-        main_window.show_all();
         main_window.present_with_time(timestamp);
     }
     
diff --git a/src/client/application/secret-mediator.vala b/src/client/application/secret-mediator.vala
index 61731a25..5ed538cf 100644
--- a/src/client/application/secret-mediator.vala
+++ b/src/client/application/secret-mediator.vala
@@ -118,7 +118,6 @@ public class SecretMediator : Geary.CredentialsMediator, Object {
         // If the main window is hidden, make it visible now and present to user as transient parent
         Gtk.Window? main_window = this.instance.get_active_window();
         if (main_window != null && !main_window.visible) {
-            main_window.show_all();
             main_window.present_with_time(Gdk.CURRENT_TIME);
         }
 
diff --git a/src/client/components/main-window.vala b/src/client/components/main-window.vala
index 61dbaa9d..e5cd7db6 100644
--- a/src/client/components/main-window.vala
+++ b/src/client/components/main-window.vala
@@ -76,6 +76,8 @@ public class MainWindow : Gtk.ApplicationWindow {
         set_styling();
         setup_layout(application.config);
         on_change_orientation();
+
+        this.main_layout.show_all();
     }
 
     public void show_infobar(MainWindowInfoBar info_bar) {
diff --git a/ui/main-toolbar.ui b/ui/main-toolbar.ui
index 030f59cc..d5c60e38 100644
--- a/ui/main-toolbar.ui
+++ b/ui/main-toolbar.ui
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<!-- Generated with glade 3.20.0 -->
+<!-- Generated with glade 3.20.2 -->
 <interface>
   <requires lib="gtk+" version="3.20"/>
   <object class="GtkImage" id="archive_image">
@@ -24,6 +24,7 @@
             <property name="always_show_image">True</property>
             <child>
               <object class="GtkImage" id="compose_new_message_image">
+                <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="icon_name">text-editor-symbolic</property>
               </object>
@@ -51,6 +52,7 @@
             <property name="always_show_image">True</property>
             <child>
               <object class="GtkImage" id="search_conversations_image">
+                <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="icon_name">preferences-system-search-symbolic</property>
               </object>
@@ -71,6 +73,7 @@
             <property name="always_show_image">True</property>
             <child>
               <object class="GtkImage" id="empty_menu_image">
+                <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="icon_name">edit-clear-all-symbolic</property>
               </object>
@@ -111,6 +114,7 @@
                 <property name="always_show_image">True</property>
                 <child>
                   <object class="GtkImage" id="reply_sender_image">
+                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="icon_name">mail-reply-sender-symbolic</property>
                   </object>
@@ -133,6 +137,7 @@
                 <property name="always_show_image">True</property>
                 <child>
                   <object class="GtkImage" id="reply_all_image">
+                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="icon_name">mail-reply-all-symbolic</property>
                   </object>
@@ -155,6 +160,7 @@
                 <property name="always_show_image">True</property>
                 <child>
                   <object class="GtkImage" id="forward_image">
+                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="icon_name">mail-forward-symbolic</property>
                   </object>
@@ -186,6 +192,7 @@
                 <property name="always_show_image">True</property>
                 <child>
                   <object class="GtkImage" id="mark_message_image">
+                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="icon_name">marker-symbolic</property>
                   </object>
@@ -206,6 +213,7 @@
                 <property name="always_show_image">True</property>
                 <child>
                   <object class="GtkImage" id="copy_message_image">
+                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="icon_name">tag-symbolic</property>
                   </object>
@@ -226,6 +234,7 @@
                 <property name="always_show_image">True</property>
                 <child>
                   <object class="GtkImage" id="move_message_image">
+                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="icon_name">folder-symbolic</property>
                   </object>
@@ -256,6 +265,7 @@
             <property name="always_show_image">True</property>
             <child>
               <object class="GtkImage" id="find_image">
+                <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="icon_name">preferences-system-search-symbolic</property>
               </object>
@@ -276,6 +286,7 @@
             <property name="always_show_image">True</property>
             <child>
               <object class="GtkImage" id="undo_image">
+                <property name="visible">True</property>
                 <property name="can_focus">False</property>
                 <property name="icon_name">edit-undo-symbolic</property>
               </object>
@@ -318,6 +329,7 @@
                 <property name="always_show_image">True</property>
                 <child>
                   <object class="GtkImage" id="trash_delete_image">
+                    <property name="visible">True</property>
                     <property name="can_focus">False</property>
                     <property name="icon_name">user-trash-symbolic</property>
                   </object>