diff --git a/addons/web/static/src/css/base.css b/addons/web/static/src/css/base.css
index dab5a783e40..379fc66c75a 100644
--- a/addons/web/static/src/css/base.css
+++ b/addons/web/static/src/css/base.css
@@ -8,7 +8,6 @@
   font-weight: normal;
   font-style: normal;
 }
-
 @font-face {
   font-family: "EntypoRegular";
   src: url("/web/static/src/font/entypo-webfont.eot") format("eot");
@@ -1102,6 +1101,9 @@
 .openerp .oe-view-manager-header .oe-view-manager-search-view {
   padding-top: 5px;
 }
+.openerp .oe-view-manager-header .oe-view-manager-switch button {
+  width: 34px;
+}
 .openerp .oe-view-manager-header .oe-view-manager-switch .oe-vm-switch-kanban:before {
   content: "";
 }
@@ -2768,7 +2770,6 @@
     top: 0px;
   }
 }
-
 .kitten-mode-activated {
   background-size: cover;
   background-attachment: fixed;
diff --git a/addons/web/static/src/css/base.sass b/addons/web/static/src/css/base.sass
index fa37c1c1617..34e2678cfbc 100644
--- a/addons/web/static/src/css/base.sass
+++ b/addons/web/static/src/css/base.sass
@@ -954,6 +954,8 @@ $sheet-padding: 16px
         .oe-view-manager-search-view
             padding-top: 5px
         .oe-view-manager-switch
+            button
+                width: 34px
             .oe-vm-switch-kanban:before
                 content: "\f009"
             .oe-vm-switch-list:before
diff --git a/addons/web/static/src/js/views.js b/addons/web/static/src/js/views.js
index e5bb93e90df..f8e368a11e4 100644
--- a/addons/web/static/src/js/views.js
+++ b/addons/web/static/src/js/views.js
@@ -407,7 +407,7 @@ instance.web.ActionManager = instance.web.Widget.extend({
             this.dialog_widget.setParent(this.dialog);
             var initialized = this.dialog_widget.appendTo(this.dialog.$el);
             this.dialog.open();
-            return initialized;
+            return $.when(initialized);
         }
         if (this.inner_widget && this.webclient.has_uncommitted_changes()) {
             return $.Deferred().reject();
@@ -638,7 +638,7 @@ instance.web.ViewManager =  instance.web.Widget.extend({
         if (!view) {
             return $.Deferred().reject();
         }
-        if (view_type !== 'form') {
+        if ((view_type !== 'form') && (view_type !== 'diagram')) {
             this.view_stack = [];
         } 
 
@@ -956,6 +956,8 @@ instance.web.ViewManager =  instance.web.Widget.extend({
                         data: {action: JSON.stringify(action)},
                         complete: instance.web.unblockUI
                     });
+                } else {
+                    self.do_warn("Warning", "No record selected.");
                 }
                 break;
             case 'leave_debug':
diff --git a/addons/web_diagram/static/src/css/base_diagram.css b/addons/web_diagram/static/src/css/base_diagram.css
index 6de8b5deb8a..0e1079836d1 100644
--- a/addons/web_diagram/static/src/css/base_diagram.css
+++ b/addons/web_diagram/static/src/css/base_diagram.css
@@ -4,12 +4,6 @@
     margin: 0 0 0 2px;
 }
 
-.openerp .oe_diagram_pager {
-    float:right;
-    /*text-align: right;*/
-    white-space: nowrap;
-}
-
 .openerp .oe_diagram_buttons {
     float: left;
 }
@@ -51,3 +45,6 @@
     user-select: none;
 }
 
+.oe-view-manager-switch .oe-vm-switch-diagram:before {
+  content: "";
+}
diff --git a/addons/web_diagram/static/src/xml/base_diagram.xml b/addons/web_diagram/static/src/xml/base_diagram.xml
index 54b06aafb27..9fc5c427220 100644
--- a/addons/web_diagram/static/src/xml/base_diagram.xml
+++ b/addons/web_diagram/static/src/xml/base_diagram.xml
@@ -1,11 +1,11 @@
 <template>
+
 <t t-name="DiagramView.pager">
-    <div class="oe_diagram_pager">
         <t t-if="widget.options.pager !== false" t-call="ViewPager">
             <span class="oe_diagram_pager_state"></span>
         </t>
-    </div>
 </t>
+
 <t t-name="DiagramView">
     <div class="oe_diagram_header" t-att-id="widget.element_id + '_header'">
         <h3 class="oe_diagram_title"/>