diff --git a/addressbook/templates/pixelegg/images/advanced-search.png b/addressbook/templates/pixelegg/images/advanced-search.png
new file mode 100644
index 0000000000..f7e3f68b11
Binary files /dev/null and b/addressbook/templates/pixelegg/images/advanced-search.png differ
diff --git a/api/js/etemplate/et2_widget_dialog.js b/api/js/etemplate/et2_widget_dialog.js
index edfe6a153b..7d4f0702c8 100644
--- a/api/js/etemplate/et2_widget_dialog.js
+++ b/api/js/etemplate/et2_widget_dialog.js
@@ -387,7 +387,7 @@ var et2_dialog = (function(){ "use strict"; return et2_widget.extend(
 				}
 				if (button.image)
 				{
-					button.style = 'background-image: url('+this.egw().image(button.image)+')';
+					button.style = 'background-image: url('+this.egw().image(button.image,'etemplate')+')';
 					delete button.image;
 				}
 			}
diff --git a/api/js/jsapi/app_base.js b/api/js/jsapi/app_base.js
index df89758053..ab25cfcb89 100644
--- a/api/js/jsapi/app_base.js
+++ b/api/js/jsapi/app_base.js
@@ -739,6 +739,7 @@ var AppJS = (function(){ "use strict"; return Class.extend(
 		buttons['save'] = {
 			text: this.egw.lang('save'),
 			default: true,
+			style: 'background-image: url('+this.egw.image('save')+')',
 			click: function() {
 				// Add a new favorite
 				var name = jQuery("#name",this);
@@ -807,14 +808,18 @@ var AppJS = (function(){ "use strict"; return Class.extend(
 				jQuery(this).dialog("close");
 			}
 		};
-		buttons[this.egw.lang("cancel")] = function() {
-			if(typeof self.favorite_popup.group !== 'undefined' && self.favorite_popup.group.set_value)
-			{
-				self.favorite_popup.group.set_value(null);
+		buttons['cancel'] = {
+			text: this.egw.lang("cancel"),
+			style: 'background-image: url('+this.egw.image('cancel')+')',
+			click: function() {
+				if(typeof self.favorite_popup.group !== 'undefined' && self.favorite_popup.group.set_value)
+				{
+					self.favorite_popup.group.set_value(null);
+				}
+				jQuery(this).dialog("close");
 			}
-			jQuery(this).dialog("close");
 		};
-
+		
 		this.favorite_popup.dialog({
 			autoOpen: false,
 			modal: true,
diff --git a/filemanager/js/app.js b/filemanager/js/app.js
index 600cf10c15..ece8f823cd 100644
--- a/filemanager/js/app.js
+++ b/filemanager/js/app.js
@@ -353,8 +353,8 @@ app.classes.filemanager = AppJS.extend(
 			if (_data.uploaded[file].confirm && !_data.uploaded[file].confirmed)
 			{
 				var buttons = [
-					{text: this.egw.lang("Yes"), id: "overwrite", class: "ui-priority-primary", "default": true},
-					{text: this.egw.lang("Rename"), id:"rename"},
+					{text: this.egw.lang("Yes"), id: "overwrite", class: "ui-priority-primary", "default": true, image: 'check',},
+					{text: this.egw.lang("Rename"), id:"rename", image: 'edit',},
 					{text: this.egw.lang("Cancel"), id:"cancel"}
 				];
 				if (_data.uploaded[file].confirm === "is_dir")
diff --git a/mail/js/app.js b/mail/js/app.js
index c8dbe22cba..2fb4a7763d 100644
--- a/mail/js/app.js
+++ b/mail/js/app.js
@@ -2010,7 +2010,7 @@ app.classes.mail = AppJS.extend(
 			if (_confirm)
 			{
 				var buttons = [
-					{text: this.egw.lang("Yes"), id: "all", "class": "ui-priority-primary", "default": true},
+					{text: this.egw.lang("Yes"), id: "all", "class": "ui-priority-primary", "default": true, image: 'check'},
 					{text: this.egw.lang("Cancel"), id:"cancel"}
 				];
 				var messageToDisplay = '';