diff --git a/api/js/etemplate/et2_extension_nextmatch_actions.js b/api/js/etemplate/et2_extension_nextmatch_actions.js
index 0100340adc..fe38b39b46 100644
--- a/api/js/etemplate/et2_extension_nextmatch_actions.js
+++ b/api/js/etemplate/et2_extension_nextmatch_actions.js
@@ -420,44 +420,45 @@ function nm_open_popup(_action, _selected)
 			var d_buttons = [];
 			var action = _action;
 			popup.show();
-			var buttons = jQuery('button:visible',popup).each(function(index) {
+			jQuery('button:visible',popup).each(function(index) {
 				var but = jQuery(this);
-				but.hide();
 				if(but.attr("id"))
 				{
 					// Find the associated widget
 					var widget_id = but.attr("id").replace(_action.data.nextmatch.getInstanceManager().uniqueId+'_', '');
 					var button = nm_popup_action.data.nextmatch.getRoot().getWidgetById(widget_id);
 				}
-				d_buttons.push({
+				var button_data = {
 					text: but.text(),
+					id: widget_id,
 					click: button && button.onclick ? function(e) {
-						dialog.dialog("close");
+						jQuery(this).dialog("close");
 						nm_popup_action = action;
 						button.onclick.apply(button, e.currentTarget);
 					} : function(e) {
-						dialog.dialog("close");
+						jQuery(this).dialog("close");
 						nm_popup_action = null;
 					}
-				});
-			});
-			// Need to get the dialog width before make it hidden
-			var dialog_width = dialog.outerWidth(true);
-			popup.hide();
-			dialog.dialog({
-				title: jQuery('.promptheader',popup).text(),
-				modal: true,
-				buttons: d_buttons,
-				minWidth: dialog_width,
-				close: function(event, ui) {
-					// Need to destroy the dialog, etemplate widget needs divs back where they were
-					dialog.dialog("destroy");
-
-					// Put it back where it came from, or et2 will error when clear() is called
-					dialog.appendTo(dialog_parent);
-					buttons.show();
+				};
+				if(button && button.options && button.options.image)
+				{
+					button_data.image = button.options.image;
 				}
+				d_buttons.push(button_data);
 			});
+
+			popup.hide();
+			var _dialog = et2_dialog.show_dialog(function() {
+					dialog_parent.append(dialog);
+				},
+				'',
+				jQuery('.promptheader',popup).text(),
+				{},
+				d_buttons
+			);
+			_dialog.set_dialog_type('');
+			_dialog.div.append(dialog)
+					.css('overflow', 'initial');
 		}
 
 		// Reset global variables
diff --git a/api/js/etemplate/et2_widget_selectAccount.js b/api/js/etemplate/et2_widget_selectAccount.js
index e9b64de849..a41f34186d 100644
--- a/api/js/etemplate/et2_widget_selectAccount.js
+++ b/api/js/etemplate/et2_widget_selectAccount.js
@@ -435,23 +435,24 @@ var et2_selectAccount = (function(){ "use strict"; return et2_selectbox.extend(
 	 */
 	_create_dialog: function(widgets, update_function) {
 		this.dialog = widgets;
-		widgets.dialog({
-			title: this.options.label ? this.options.label : this.egw().lang('Select'),
-			modal: true,
-			// Static size for easier layout
-			width: "500",
-			height: "350",
-			buttons: [{
+		var dialog = et2_dialog.show_dialog(false,
+			'',
+			this.options.label ? this.options.label : this.egw().lang('Select'),
+			{},
+			[{
 				text: this.egw().lang("ok"),
+				image: 'check',
 				click: update_function
-				},{
+			},{
 				text: this.egw().lang("cancel"),
-				click: function() {
-					jQuery(this).dialog("close");
-					jQuery(this).dialog("destroy");
-				}}
-			]
-		});
+				image: 'cancel'
+			}]
+		);
+		dialog.set_dialog_type('');
+		// Static size for easier layout
+		dialog.div.dialog({width: "500", height: "370"});
+
+		dialog.div.append(widgets.width('100%'));
 		return widgets;
 	},
 
diff --git a/api/templates/default/etemplate2.css b/api/templates/default/etemplate2.css
index c67d52cf9a..b8403d8c3b 100644
--- a/api/templates/default/etemplate2.css
+++ b/api/templates/default/etemplate2.css
@@ -699,7 +699,7 @@ div.et2_link_entry:after {
   margin: -12px;
 }
 div.et2_link_entry select, div.et2_link_entry {
-  width: 40%;
+  /*width: 40%;*/
   margin-right: 10px;
 }
 /* Icons in app selection */
diff --git a/infolog/templates/default/index.xet b/infolog/templates/default/index.xet
index 4f46cf2a1d..86787dbd55 100644
--- a/infolog/templates/default/index.xet
+++ b/infolog/templates/default/index.xet
@@ -165,10 +165,10 @@
 									<taglist-account id="responsible" rows="5" account_type="both" class=" et2_fullWidth" empty_label="Delegation"/>
 								</vbox>
 								<hbox>
-									<button label="Ok" id="responsible_action[ok]" onclick="nm_submit_popup(this); return false;"/>
+									<button label="Ok" id="responsible_action[ok]" onclick="nm_submit_popup(this); return false;" image="check" background_image="true"/>
 									<button label="Add" id="responsible_action[add]" onclick="nm_submit_popup(this); return false;"/>
 									<button label="Delete" id="responsible_action[delete]" onclick="nm_submit_popup(this); return false;"/>
-									<buttononly label="Cancel" onclick="nm_hide_popup(this,'responsible_popup');"/>
+									<button label="Cancel" id="responsible_cancel" onclick="nm_hide_popup(this,'responsible_popup');" image="cancelled" background_image="true"/>
 								</hbox>
 							</vbox>
 						</box>
@@ -177,9 +177,9 @@
 								<description value="Delete" class="promptheader"/>
 								<description value="Delete selected entries?" id="delete_prompt"/>
 								<hbox>
-									<button label="Yes - Delete" id="delete" onclick="nm_submit_popup(this); return false;"/>
-									<button label="Yes - Delete including sub-entries" id="delete_sub" onclick="nm_popup_action.id = 'delete_sub'; nm_submit_popup(this); return false;"/>
-									<buttononly label="No - Cancel" onclick="nm_hide_popup(this,'delete_popup');"/>
+									<button label="Yes - Delete" id="delete" onclick="nm_submit_popup(this); return false;" image="check" background_image="true"/>
+									<button label="Yes - Delete including sub-entries" id="delete_sub" onclick="nm_popup_action.id = 'delete_sub'; nm_submit_popup(this); return false;" image="check" background_image="true"/>
+									<button label="No - Cancel" id="delete_cancel" onclick="nm_hide_popup(this,'delete_popup');" image="cancelled" background_image="true"/>
 								</hbox>
 							</vbox>
 						</box>
@@ -190,7 +190,7 @@
 								<hbox>
 									<button label="Add" id="link_action[add]" onclick="nm_submit_popup(this); return false;"/>
 									<button label="Delete" id="link_action[delete]" onclick="nm_submit_popup(this); return false;"/>
-									<buttononly label="Cancel" onclick="nm_hide_popup(this,'link_popup');"/>
+									<button label="Cancel" id="link_cancel" onclick="nm_hide_popup(this,'link_popup');" image="cancelled" background_image="true"/>
 								</hbox>
 							</vbox>
 						</box>
@@ -200,8 +200,8 @@
 								<description id="startdate_action[title]"/>
 								<date-time id="startdate" class="action_popup-content"/>
 								<hbox>
-									<button label="Ok" id="startdate_action[ok]" onclick="nm_submit_popup(this); return false;"/>
-									<buttononly label="Cancel" onclick="nm_hide_popup(this,'link_popup');"/>
+									<button label="Ok" id="startdate_action[ok]" onclick="nm_submit_popup(this); return false;" image="check" background_image="true"/>
+									<button label="Cancel" id="startdate_cancel" onclick="nm_hide_popup(this,'link_popup');" image="cancelled" background_image="true"/>
 								</hbox>
 							</vbox>
 						</box>
@@ -211,8 +211,8 @@
 								<description id="enddate_action[title]"/>
 								<date-time id="enddate" class="action_popup-content"/>
 								<hbox>
-									<button label="Ok" id="enddate_action[ok]" onclick="nm_submit_popup(this); return false;"/>
-									<buttononly label="Cancel" onclick="nm_hide_popup(this,'link_popup');"/>
+									<button label="Ok" id="enddate_action[ok]" onclick="nm_submit_popup(this); return false;" image="check" background_image="true"/>
+									<button label="Cancel" id="enddate_cancel" onclick="nm_hide_popup(this,'link_popup');" image="cancelled" background_image="true"/>
 								</hbox>
 							</vbox>
 						</box>
diff --git a/mail/js/app.js b/mail/js/app.js
index a6b11142fa..c6820c60b9 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -1074,8 +1074,8 @@ app.classes.mail = AppJS.extend(
 				typeof dataElem.data.flags.mdnsent == 'undefined' && typeof dataElem.data.flags.mdnnotsent == 'undefined')
 			{
 				var buttons = [
-					{text: this.egw.lang("Yes"), id: "mdnsent"},
-					{text: this.egw.lang("No"), id:"mdnnotsent"}
+					{text: this.egw.lang("Yes"), id: "mdnsent", image: "check"},
+					{text: this.egw.lang("No"), id:"mdnnotsent", image: "cancelled"}
 				];
 				et2_dialog.show_dialog(function(_button_id, _value) {
 					switch (_button_id)
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index d558beaa69..fe9df531ac 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -193,8 +193,7 @@
   .et2_selectbox .ui-multiselect-checkboxes div.ui-icon-close {
     /*visibility: hidden;*/
     background-image: url(../images/close.png);
-    background: #FFFFFF;
-    margin: 2px;
+    margin: -2px -3px;
     padding: 0px;
   }
   /**
diff --git a/pixelegg/less/etemplate2.less b/pixelegg/less/etemplate2.less
index 6fa3936332..ceb9006283 100755
--- a/pixelegg/less/etemplate2.less
+++ b/pixelegg/less/etemplate2.less
@@ -155,9 +155,8 @@ input[type=button] {}
 
 .et2_selectbox .ui-multiselect-checkboxes div.ui-icon-close{
     /*visibility: hidden;*/
-     background-image: url(../images/close.png);
-     background: @gray_0;
-     margin: 2px;
+    background-image: url(../images/close.png);
+    margin: -2px -3px;
     padding: 0px;
 }
 /**
diff --git a/preferences/templates/default/password.xet b/preferences/templates/default/password.xet
index 1c4d2ecb07..562cdcef4b 100644
--- a/preferences/templates/default/password.xet
+++ b/preferences/templates/default/password.xet
@@ -36,7 +36,7 @@
 			</rows>
 		</grid>
 		<hbox class="dialogFooterToolbar">
-			<button label="Change" id="button[change]"/>
+			<button label="Change" id="button[change]" image="check" background_image="true"/>
 			<button label="Cancel" id="button[cancel]" onclick="window.close();"/>
 		</hbox>
 	</template>