diff --git a/modules/addressbook/e-book-shell-view-actions.c b/modules/addressbook/e-book-shell-view-actions.c
index 5214f61..fa2a953 100644
--- a/modules/addressbook/e-book-shell-view-actions.c
+++ b/modules/addressbook/e-book-shell-view-actions.c
@@ -849,13 +849,6 @@ static GtkActionEntry contact_entries[] = {
 	  N_("_Actions"),
 	  NULL,
 	  NULL,
-	  NULL },
-
-	{ "contact-preview-menu",
-	  NULL,
-	  N_("_Preview"),
-	  NULL,
-	  NULL,
 	  NULL }
 };
 
diff --git a/modules/calendar/e-memo-shell-view-actions.c b/modules/calendar/e-memo-shell-view-actions.c
index 394d609..0bbd8a3 100644
--- a/modules/calendar/e-memo-shell-view-actions.c
+++ b/modules/calendar/e-memo-shell-view-actions.c
@@ -693,16 +693,7 @@ static GtkActionEntry memo_entries[] = {
 	  N_("Open _Web Page"),
 	  NULL,
 	  NULL,  /* XXX Add a tooltip! */
-	  G_CALLBACK (action_memo_open_url_cb) },
-
-	/*** Menus ***/
-
-	{ "memo-preview-menu",
-	  NULL,
-	  N_("_Preview"),
-	  NULL,
-	  NULL,
-	  NULL }
+	  G_CALLBACK (action_memo_open_url_cb) }
 };
 
 static EPopupActionEntry memo_popup_entries[] = {
diff --git a/modules/calendar/e-task-shell-view-actions.c b/modules/calendar/e-task-shell-view-actions.c
index 6e79c23..92d9c63 100644
--- a/modules/calendar/e-task-shell-view-actions.c
+++ b/modules/calendar/e-task-shell-view-actions.c
@@ -847,13 +847,6 @@ static GtkActionEntry task_entries[] = {
 	  N_("_Actions"),
 	  NULL,
 	  NULL,
-	  NULL },
-
-	{ "task-preview-menu",
-	  NULL,
-	  N_("_Preview"),
-	  NULL,
-	  NULL,
 	  NULL }
 };
 
diff --git a/modules/mail/e-mail-shell-view-actions.c b/modules/mail/e-mail-shell-view-actions.c
index 93a3bf6..becbaa7 100644
--- a/modules/mail/e-mail-shell-view-actions.c
+++ b/modules/mail/e-mail-shell-view-actions.c
@@ -1208,13 +1208,6 @@ static GtkActionEntry mail_entries[] = {
 	  N_("_Label"),
 	  NULL,
 	  NULL,
-	  NULL },
-
-	{ "mail-preview-menu",
-	  NULL,
-	  N_("_Preview"),
-	  NULL,
-	  NULL,
 	  NULL }
 };
 
diff --git a/shell/e-shell-window-actions.c b/shell/e-shell-window-actions.c
index 03fa537..ca96f31 100644
--- a/shell/e-shell-window-actions.c
+++ b/shell/e-shell-window-actions.c
@@ -1633,13 +1633,6 @@ static GtkActionEntry shell_entries[] = {
 	  NULL,
 	  NULL },
 
-	{ "switcher-menu",
-	  NULL,
-	  N_("_Switcher Appearance"),
-	  NULL,
-	  NULL,
-	  NULL },
-
 	{ "view-menu",
 	  NULL,
 	  N_("_View"),
diff --git a/ui/evolution-contacts.ui b/ui/evolution-contacts.ui
index 864a5aa..edd741e 100644
--- a/ui/evolution-contacts.ui
+++ b/ui/evolution-contacts.ui
@@ -24,14 +24,13 @@
       </placeholder>
     </menu>
     <menu action='view-menu'>
-      <placeholder name='view-custom-menus'>
-        <menu action='contact-preview-menu'>
+      <menu action='layout-menu'>
+        <placeholder name='preview-actions'>
           <menuitem action='contact-preview'/>
-          <separator/>
           <menuitem action='contact-view-classic'/>
           <menuitem action='contact-view-vertical'/>
-        </menu>
-      </placeholder>
+        </placeholder>
+      </menu>
     </menu>
     <placeholder name='custom-menus'>
       <menu action='contact-actions-menu'>
diff --git a/ui/evolution-mail.ui b/ui/evolution-mail.ui
index f2c162c..93374a4 100644
--- a/ui/evolution-mail.ui
+++ b/ui/evolution-mail.ui
@@ -13,14 +13,13 @@
       </placeholder>
     </menu>
     <menu action='view-menu'>
-      <placeholder name='view-custom-menus'>
-        <menu action='mail-preview-menu'>
+      <menu action='layout-menu'>
+        <placeholder action='preview-actions'>
           <menuitem action='mail-preview'/>
-          <separator/>
           <menuitem action='mail-view-classic'/>
           <menuitem action='mail-view-vertical'/>
-        </menu>
-      </placeholder>
+        </placeholder>
+      </menu>
       <separator/>
       <placeholder name='mail-message-list-actions'>
         <menuitem action='mail-threads-group-by'/>
diff --git a/ui/evolution-memos.ui b/ui/evolution-memos.ui
index 0d842b1..97aceab 100644
--- a/ui/evolution-memos.ui
+++ b/ui/evolution-memos.ui
@@ -19,14 +19,13 @@
       </placeholder>
     </menu>
     <menu action='view-menu'>
-      <placeholder name='view-custom-menus'>
-        <menu action='memo-preview-menu'>
+      <menu action='layout-menu'>
+        <placeholder name='preview-actions'>
           <menuitem action='memo-preview'/>
-          <separator/>
           <menuitem action='memo-view-classic'/>
           <menuitem action='memo-view-vertical'/>
-        </menu>
-      </placeholder>
+        </placeholder>
+      </menu>
     </menu>
   </menubar>
   <toolbar name='main-toolbar'>
diff --git a/ui/evolution-shell.ui b/ui/evolution-shell.ui
index ccfeb86..c6e3c37 100644
--- a/ui/evolution-shell.ui
+++ b/ui/evolution-shell.ui
@@ -40,15 +40,14 @@
         <menuitem action='show-toolbar'/>
         <menuitem action='show-taskbar'/>
         <menuitem action='show-sidebar'/>
-      </menu>
-      <placeholder name='view-custom-menus'/>
-      <menu action='switcher-menu'>
+        <separator/>
+        <menuitem action='show-switcher'/>
         <menuitem action='switcher-style-both'/>
         <menuitem action='switcher-style-icons'/>
         <menuitem action='switcher-style-text'/>
         <menuitem action='switcher-style-user'/>
         <separator/>
-        <menuitem action='show-switcher'/>
+        <placeholder name='preview-actions'/>
       </menu>
     </menu>
     <placeholder name='custom-menus'/>
diff --git a/ui/evolution-tasks.ui b/ui/evolution-tasks.ui
index 7069588..bf45073 100644
--- a/ui/evolution-tasks.ui
+++ b/ui/evolution-tasks.ui
@@ -22,14 +22,13 @@
       </placeholder>
     </menu>
     <menu action='view-menu'>
-      <placeholder name='view-custom-menus'>
-        <menu action='task-preview-menu'>
+      <menu action='layout-menu'>
+        <placeholder name='preview-actions'>
           <menuitem action='task-preview'/>
-          <separator/>
           <menuitem action='task-view-classic'/>
           <menuitem action='task-view-vertical'/>
-        </menu>
-      </placeholder>
+        </placeholder>
+      </menu>
     </menu>
     <placeholder name='custom-menus'>
       <menu action='task-actions-menu'>
