diff --git a/etemplate/js/et2_widget_selectbox.js b/etemplate/js/et2_widget_selectbox.js
index a98060b9f1..3aca8020dd 100644
--- a/etemplate/js/et2_widget_selectbox.js
+++ b/etemplate/js/et2_widget_selectbox.js
@@ -213,6 +213,17 @@ var et2_selectbox = et2_inputWidget.extend(
 					this._appendOptionElement('', this.options.empty_label);
 				}
 			}
+			if(this.expand_button)
+			{
+				if(_multiple)
+				{
+					this.expand_button.addClass('ui-icon-minus').removeClass('ui-icon-plus');
+				}
+				else
+				{
+					this.expand_button.removeClass('ui-icon-minus').addClass('ui-icon-plus');
+				}
+			}
 		}
 	},
 
@@ -571,15 +582,18 @@ var et2_selectbox = et2_inputWidget.extend(
 			if (!this.expand_button)
 			{
 				var button_id = this.getInstanceManager().uniqueId+'_'+this.id.replace(/\./g, '-') + "_expand";
-				this.expand_button = $j("<button class='et2_button et2_button_icon et2_selectbox_expand' id='" + button_id + "'/>")
+				this.expand_button = $j("<button class='et2_button et2_button_icon et2_selectbox_expand ui-icon' id='" + button_id + "'/>")
+					.addClass(this.options.multiple ? 'ui-icon-minus' : 'ui-icon-plus')
 					.on("click", jQuery.proxy(function(e) {
 						if(typeof this.input.attr('size') !== 'undefined' && this.input.attr('size') != 1)
 						{
 							this.set_multiple(false, 1);
+							this.expand_button.removeClass('ui-icon-minus').addClass('ui-icon-plus');
 						}
 						else
 						{
 							this.set_multiple(true, this.options.expand_multiple_rows);
+							this.expand_button.addClass('ui-icon-minus').removeClass('ui-icon-plus');
 						}
 					},this));
 			}
diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index 09bf4560d1..16979dc79d 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -207,7 +207,7 @@ input[type=button] {
 }
 .et2_button_icon {
   border: none;
-  background: transparent;
+  background-color: transparent;
   padding: 0px;
 }
 button.et2_button_text:hover,
@@ -304,6 +304,7 @@ button#cancel {
  */
 .et2_selectbox_expand {
   width: 16px;
+  display: inline-block;
 }
 .et2_selectbox .ui-widget-header {
   padding: 0px 6px 0px 6px;