diff --git a/etemplate/templates/default/etemplate2.css b/etemplate/templates/default/etemplate2.css
index 2b65dbd1f0..b22e2db25f 100644
--- a/etemplate/templates/default/etemplate2.css
+++ b/etemplate/templates/default/etemplate2.css
@@ -247,8 +247,8 @@ button#cancel {
 	background-position: left;
 }
 .ui-dialog-buttonset button {
-	padding-left: 6px !important;
-	background-position: left !important;
+	padding-left: 6px;
+	background-position: left;
 	background-repeat: no-repeat !important;
 }
 /**
diff --git a/pixelegg/css/mobile.css b/pixelegg/css/mobile.css
index af4fe343aa..8491d22079 100644
--- a/pixelegg/css/mobile.css
+++ b/pixelegg/css/mobile.css
@@ -1680,7 +1680,16 @@ span.ui-icon-search {
 .ui-dialog-buttonpane {
   background-color: #679fd2;
 }
-.ui-dialog-buttonset button {
+.ui-dialog-buttonset button.ui-button-text-only {
+  background-color: #cdcdcd;
+  background: inherit;
+  color: #000000 !important;
+  font-weight: normal !important;
+}
+.ui-dialog-buttonset button.ui-button-text-only:hover {
+  background-color: #b4b4b4;
+}
+.ui-dialog-buttonset button.ui-button {
   /*.border_normal;*/
   /*.box_shadow_standard_light;*/
   /*.rounded (3px);*/
@@ -1706,19 +1715,10 @@ span.ui-icon-search {
   /*.Button_size_h32_auto;*/
   height: 24px;
 }
-.ui-dialog-buttonset button:hover {
+.ui-dialog-buttonset button.ui-button:hover {
   background-color: #b4b4b4;
   color: #1e1e1e;
 }
-.ui-dialog-buttonset button.ui-button-text-only {
-  background-color: #cdcdcd;
-  background: inherit;
-  color: #000000 !important;
-  font-weight: normal !important;
-}
-.ui-dialog-buttonset button.ui-button-text-only:hover {
-  background-color: #b4b4b4;
-}
 /*###########################################*/
 /*Dialog: calendar edit series*/
 div#ui-datepicker-div {
@@ -2194,6 +2194,7 @@ body {
  * @package pixelegg
  * @version $Id$
  */
+@import-once "def_colors.less";
 #socialMedia {
   position: relative;
   bottom: 20px;
@@ -4271,7 +4272,7 @@ td.message span.message {
   text-decoration: none;
   height: 32px;
   /*font-size: 1.1em;*/
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   line-height: 1.5em;
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul li a:hover {
@@ -4295,7 +4296,7 @@ td.message span.message {
 }
 #egw_fw_header #egw_fw_topmenu #egw_fw_topmenu_items ul a#topmenu_home:before {
   padding-right: 20px;
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   content: " ";
   background-image: url(../images/topmenu_items/home.png);
   background-repeat: no-repeat;
@@ -4691,7 +4692,7 @@ td.message span.message {
   padding-left: 3em;
   color: #999999;
   /*font-size: 12px;*/
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   line-height: 17px;
 }
 #egw_fw_sidebar #egw_fw_sidemenu .egw_fw_ui_scrollarea_outerdiv .egw_fw_ui_sidemenu_entry_header object {
@@ -4863,7 +4864,7 @@ td.message span.message {
   margin: 5px 0px 3px 5px;
   padding: 0px 0px 0px 15px;
   line-height: 1em;
-  font-size: 12.1px;
+  font-size: 12.100000000000001px;
   background-image: url(../images/arrow_left.png);
   background-repeat: no-repeat;
   background-position: left center;
@@ -7178,7 +7179,7 @@ span.egw_tutorial_title {
     margin: 5px 0px 3px 5px;
     padding: 0px 0px 0px 15px;
     line-height: 1em;
-    font-size: 12.1px;
+    font-size: 12.100000000000001px;
     background-image: url(../images/arrow_left.png);
     background-repeat: no-repeat;
     background-position: left center;
diff --git a/pixelegg/css/pixelegg.css b/pixelegg/css/pixelegg.css
index 15ac4debb5..cc269dad4a 100644
--- a/pixelegg/css/pixelegg.css
+++ b/pixelegg/css/pixelegg.css
@@ -1669,7 +1669,16 @@ span.ui-icon-search {
 .ui-dialog-buttonpane {
   background-color: #679fd2;
 }
-.ui-dialog-buttonset button {
+.ui-dialog-buttonset button.ui-button-text-only {
+  background-color: #cdcdcd;
+  background: inherit;
+  color: #000000 !important;
+  font-weight: normal !important;
+}
+.ui-dialog-buttonset button.ui-button-text-only:hover {
+  background-color: #b4b4b4;
+}
+.ui-dialog-buttonset button.ui-button {
   /*.border_normal;*/
   /*.box_shadow_standard_light;*/
   /*.rounded (3px);*/
@@ -1695,19 +1704,10 @@ span.ui-icon-search {
   /*.Button_size_h32_auto;*/
   height: 24px;
 }
-.ui-dialog-buttonset button:hover {
+.ui-dialog-buttonset button.ui-button:hover {
   background-color: #b4b4b4;
   color: #1e1e1e;
 }
-.ui-dialog-buttonset button.ui-button-text-only {
-  background-color: #cdcdcd;
-  background: inherit;
-  color: #000000 !important;
-  font-weight: normal !important;
-}
-.ui-dialog-buttonset button.ui-button-text-only:hover {
-  background-color: #b4b4b4;
-}
 /*###########################################*/
 /*Dialog: calendar edit series*/
 div#ui-datepicker-div {
diff --git a/pixelegg/less/jquery-ui.less b/pixelegg/less/jquery-ui.less
index 786be7091c..d9caba7448 100755
--- a/pixelegg/less/jquery-ui.less
+++ b/pixelegg/less/jquery-ui.less
@@ -314,11 +314,6 @@ span.ui-icon-search{
 
 .ui-dialog-buttonset{
 
-    button{
-        .Complete_Button_text_icon_before;
-
-        &:hover{ background-color: @gray_30; color: @gray_90;}
-    }
 
     button.ui-button-text-only {background-color: @gray_20;
                                 background: inherit;
@@ -327,6 +322,11 @@ span.ui-icon-search{
 
                                 &:hover{ background-color: @gray_30;}
     }
+    button.ui-button{
+        .Complete_Button_text_icon_before;
+
+        &:hover{ background-color: @gray_30; color: @gray_90;}
+    }
 }
 
 /*###########################################*/