diff --git a/rhodecode/public/css/style.css b/rhodecode/public/css/style.css
--- a/rhodecode/public/css/style.css
+++ b/rhodecode/public/css/style.css
@@ -905,20 +905,6 @@ margin:0;
 padding:4px 8px;
 }
 
-#content div.box div.form div.fields div.field div.input a.ui-input-file {
-width:28px;
-height:28px;
-display:inline;
-position:absolute;
-overflow:hidden;
-cursor:pointer;
-background:#e5e3e3 url("../images/button_browse.png") no-repeat;
-border:none;
-text-decoration:none;
-margin:0 0 0 6px;
-padding:0;
-}
-
 #content div.box div.form div.fields div.field div.textarea {
 border-top:1px solid #b3b3b3;
 border-left:1px solid #b3b3b3;
@@ -978,15 +964,6 @@ font-size:11px;
 padding:5px 5px 5px 0;
 }
 
-#content div.box div.form div.fields div.field div.textarea table td table td a.mceButtonActive {
-background:#b1b1b1;
-}
-
-#content div.box div.form div.fields div.field div.select a.ui-selectmenu {
-color:#565656;
-text-decoration:none;
-}
-
 #content div.box div.form div.fields div.field input[type=text]:focus,#content div.box div.form div.fields div.field input[type=password]:focus,#content div.box div.form div.fields div.field input[type=file]:focus,#content div.box div.form div.fields div.field textarea:focus,#content div.box div.form div.fields div.field select:focus {
 background:#f6f6f6;
 border-color:#666;
@@ -997,7 +974,7 @@ margin:0;
 padding:0 0 0 8px;
 }
 
-div.form div.fields div.field div.highlight .ui-state-default {
+div.form div.fields div.field div.highlight .ui-button {
 background:#4e85bb url("../images/button_highlight.png") repeat-x;
 border-top:1px solid #5c91a4;
 border-left:1px solid #2a6f89;
@@ -1019,7 +996,7 @@ margin:0;
 padding:6px 12px;
 }
 
-#content div.box div.form div.fields div.buttons div.highlight input.ui-state-default {
+#content div.box div.form div.fields div.buttons div.highlight input.ui-button {
 background:#4e85bb url("../../images/button_highlight.png") repeat-x;
 border-top:1px solid #5c91a4;
 border-left:1px solid #2a6f89;
@@ -1408,7 +1385,7 @@ margin:0;
 padding:10px 0 0 150px;
 }
 
-#register div.form div.fields div.buttons div.highlight input.ui-state-default {
+#register div.form div.fields div.buttons div.highlight input.ui-button {
 background:url("../images/button_highlight.png") repeat-x scroll 0 0 #4E85BB;
 color:#FFF;
 border-color:#5C91A4 #2B7089 #1A6480 #2A6F89;
@@ -2061,7 +2038,7 @@ border-left:1px solid #316293;
 border:1px solid #316293;
 }
 
-#content div.box div.title div.search div.button input.ui-state-default {
+#content div.box div.title div.search div.button input.ui-button {
 background:#4e85bb url("../../images/button_highlight.png") repeat-x;
 border:1px solid #316293;
 border-left:none;
@@ -2075,7 +2052,7 @@ border-left:none;
 color:#FFF;
 }
 
-#content div.box div.form div.fields div.field div.highlight .ui-state-default {
+#content div.box div.form div.fields div.field div.highlight .ui-button {
 background:#4e85bb url("../../images/button_highlight.png") repeat-x;
 border-top:1px solid #5c91a4;
 border-left:1px solid #2a6f89;
@@ -2220,7 +2197,7 @@ font-weight:700;
 margin:0;
 }
 
-div.form div.fields div.field div.button .ui-state-default,#content div.box div.form div.fields div.buttons input.ui-state-default {
+div.form div.fields div.field div.button .ui-button,#content div.box div.form div.fields div.buttons input.ui-button {
 background:#e5e3e3 url("../images/button.png") repeat-x;
 border-top:1px solid #DDD;
 border-left:1px solid #c6c6c6;
@@ -2268,7 +2245,7 @@ margin:6px 0 0;
 padding:0;
 }
 
-#content div.box div.action div.button input.ui-state-default,#login div.form div.fields div.buttons input.ui-state-default,#register div.form div.fields div.buttons input.ui-state-default {
+#content div.box div.action div.button input.ui-button,#login div.form div.fields div.buttons input.ui-button,#register div.form div.fields div.buttons input.ui-button {
 background:#e5e3e3 url("../images/button.png") repeat-x;
 border-top:1px solid #DDD;
 border-left:1px solid #c6c6c6;
diff --git a/rhodecode/templates/admin/ldap/ldap.html b/rhodecode/templates/admin/ldap/ldap.html
--- a/rhodecode/templates/admin/ldap/ldap.html
+++ b/rhodecode/templates/admin/ldap/ldap.html
@@ -56,7 +56,7 @@
             </div>
             
             <div class="buttons">
-            ${h.submit('save','Save',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+            ${h.submit('save','Save',class_="ui-button")}
             </div>              
         </div>
     </div>     
diff --git a/rhodecode/templates/admin/permissions/permissions.html b/rhodecode/templates/admin/permissions/permissions.html
--- a/rhodecode/templates/admin/permissions/permissions.html
+++ b/rhodecode/templates/admin/permissions/permissions.html
@@ -68,7 +68,7 @@
              </div>	
 				        
 	        <div class="buttons">
-	        ${h.submit('set','set',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+	        ${h.submit('set','set',class_="ui-button")}
 	        </div>	                                                               
         </div>
     </div>  
diff --git a/rhodecode/templates/admin/repos/repo_add.html b/rhodecode/templates/admin/repos/repo_add.html
--- a/rhodecode/templates/admin/repos/repo_add.html
+++ b/rhodecode/templates/admin/repos/repo_add.html
@@ -59,7 +59,7 @@
                 </div>
              </div>
 	        <div class="buttons">
-	          ${h.submit('add','add',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+	          ${h.submit('add','add',class_="ui-button")}
 	        </div>                                                          
         </div>
     </div>    
diff --git a/rhodecode/templates/admin/repos/repo_add_create_repository.html b/rhodecode/templates/admin/repos/repo_add_create_repository.html
--- a/rhodecode/templates/admin/repos/repo_add_create_repository.html
+++ b/rhodecode/templates/admin/repos/repo_add_create_repository.html
@@ -56,7 +56,7 @@
                 </div>
              </div>
 	        <div class="buttons">
-	          ${h.submit('add','add',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+	          ${h.submit('add','add',class_="ui-button")}
 	        </div>                                                          
         </div>
     </div>    
diff --git a/rhodecode/templates/admin/repos/repo_edit.html b/rhodecode/templates/admin/repos/repo_edit.html
--- a/rhodecode/templates/admin/repos/repo_edit.html
+++ b/rhodecode/templates/admin/repos/repo_edit.html
@@ -156,8 +156,8 @@
              </div>
              
             <div class="buttons">
-              ${h.submit('save','Save',class_="ui-button ui-widget ui-state-default ui-corner-all")}
-              ${h.reset('reset','Reset',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+              ${h.submit('save','Save',class_="ui-button")}
+              ${h.reset('reset','Reset',class_="ui-button")}
             </div>                                                          
         </div>
     </div>
diff --git a/rhodecode/templates/admin/settings/settings.html b/rhodecode/templates/admin/settings/settings.html
--- a/rhodecode/templates/admin/settings/settings.html
+++ b/rhodecode/templates/admin/settings/settings.html
@@ -42,7 +42,7 @@
 			</div>
                             
             <div class="buttons">
-            ${h.submit('rescan','Rescan repositories',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+            ${h.submit('rescan','Rescan repositories',class_="ui-button")}
             </div>                                                          
         </div>
     </div>  
@@ -67,7 +67,7 @@
             </div>
                             
             <div class="buttons">
-            ${h.submit('reindex','Reindex',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+            ${h.submit('reindex','Reindex',class_="ui-button")}
             </div>                                                          
         </div>
     </div>  
@@ -99,8 +99,8 @@
             </div>
                                      
             <div class="buttons">
-                ${h.submit('save','Save settings',class_="ui-button ui-widget ui-state-default ui-corner-all")}
-                ${h.reset('reset','Reset',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+                ${h.submit('save','Save settings',class_="ui-button")}
+                ${h.reset('reset','Reset',class_="ui-button")}
            </div>                                                          
         </div>
     </div>      
@@ -162,8 +162,8 @@
             </div>
                                      
             <div class="buttons">
-                ${h.submit('save','Save settings',class_="ui-button ui-widget ui-state-default ui-corner-all")}
-                ${h.reset('reset','Reset',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+                ${h.submit('save','Save settings',class_="ui-button")}
+                ${h.reset('reset','Reset',class_="ui-button")}
            </div>                                                          
         </div>
     </div>      
diff --git a/rhodecode/templates/admin/users/user_add.html b/rhodecode/templates/admin/users/user_add.html
--- a/rhodecode/templates/admin/users/user_add.html
+++ b/rhodecode/templates/admin/users/user_add.html
@@ -82,7 +82,7 @@
              </div>
             
             <div class="buttons">
-              ${h.submit('save','save',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+              ${h.submit('save','save',class_="ui-button")}
             </div>             
     	</div>
     </div>
diff --git a/rhodecode/templates/admin/users/user_edit.html b/rhodecode/templates/admin/users/user_edit.html
--- a/rhodecode/templates/admin/users/user_edit.html
+++ b/rhodecode/templates/admin/users/user_edit.html
@@ -101,8 +101,8 @@
                 </div>
              </div>             
             <div class="buttons">
-              ${h.submit('save','Save',class_="ui-button ui-widget ui-state-default ui-corner-all")}
-              ${h.reset('reset','Reset',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+              ${h.submit('save','Save',class_="ui-button")}
+              ${h.reset('reset','Reset',class_="ui-button")}
             </div>             
     	</div>    
     </div>
diff --git a/rhodecode/templates/admin/users/user_edit_my_account.html b/rhodecode/templates/admin/users/user_edit_my_account.html
--- a/rhodecode/templates/admin/users/user_edit_my_account.html
+++ b/rhodecode/templates/admin/users/user_edit_my_account.html
@@ -21,7 +21,7 @@
         ${self.breadcrumbs()}       
     </div>
     <!-- end box / title -->
-    <div class="ui-tabs-panel ui-widget-content ui-corner-bottom">
+    <div>
     ${h.form(url('admin_settings_my_account_update'),method='put')}
 	    <div class="form">
 	    
@@ -82,11 +82,8 @@
 	             </div>
 	            
 	            <div class="buttons">
-	              ${h.submit('save','Save',class_="ui-button ui-widget ui-state-default ui-corner-all")}
-	              ${h.reset('reset','Reset',class_="ui-button ui-widget ui-state-default ui-corner-all")}
-	              
-	              
-	              
+	              ${h.submit('save','Save',class_="ui-button")}
+	              ${h.reset('reset','Reset',class_="ui-button")}
 	            </div>             
 	    	</div>
 	    </div>    	
diff --git a/rhodecode/templates/files/files_annotate.html b/rhodecode/templates/files/files_annotate.html
--- a/rhodecode/templates/files/files_annotate.html
+++ b/rhodecode/templates/files/files_annotate.html
@@ -51,8 +51,8 @@
 			        ${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}
 			        ${h.hidden('diff2',c.file.last_changeset.raw_id)}
 			        ${h.select('diff1',c.file.last_changeset.raw_id,c.file_history)}
-			        ${h.submit('diff','diff to revision',class_="ui-button ui-widget ui-state-default ui-corner-all")}
-			        ${h.submit('show_rev','show at revision',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+			        ${h.submit('diff','diff to revision',class_="ui-button")}
+			        ${h.submit('show_rev','show at revision',class_="ui-button")}
 			        ${h.end_form()}
 			        </div>
 			    </dd>					
diff --git a/rhodecode/templates/files/files_source.html b/rhodecode/templates/files/files_source.html
--- a/rhodecode/templates/files/files_source.html
+++ b/rhodecode/templates/files/files_source.html
@@ -22,8 +22,8 @@
 		${h.form(h.url('files_diff_home',repo_name=c.repo_name,f_path=c.f_path),method='get')}
 		${h.hidden('diff2',c.files_list.last_changeset.raw_id)}
 		${h.select('diff1',c.files_list.last_changeset.raw_id,c.file_history)}
-		${h.submit('diff','diff to revision',class_="ui-button ui-widget ui-state-default ui-corner-all")}
-		${h.submit('show_rev','show at revision',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+		${h.submit('diff','diff to revision',class_="ui-button")}
+		${h.submit('show_rev','show at revision',class_="ui-button")}
 		${h.end_form()}
 		</div>
 	</dd>
diff --git a/rhodecode/templates/login.html b/rhodecode/templates/login.html
--- a/rhodecode/templates/login.html
+++ b/rhodecode/templates/login.html
@@ -48,7 +48,7 @@
                         ##    </div>
                         ##</div>
                         <div class="buttons">
-                            ${h.submit('sign_in','Sign In',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+                            ${h.submit('sign_in','Sign In',class_="ui-button")}
                         </div>
                     </div>
                     <!-- end fields -->
diff --git a/rhodecode/templates/password_reset.html b/rhodecode/templates/password_reset.html
--- a/rhodecode/templates/password_reset.html
+++ b/rhodecode/templates/password_reset.html
@@ -34,7 +34,7 @@
 			                        
 			            <div class="buttons">
 				            <div class="nohighlight">
-				              ${h.submit('send','Reset my password',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+				              ${h.submit('send','Reset my password',class_="ui-button")}
 							  	<div class="activation_msg">${_('Your new password will be send to matching email address')}</div>
 				            </div>
 			            </div>             
diff --git a/rhodecode/templates/register.html b/rhodecode/templates/register.html
--- a/rhodecode/templates/register.html
+++ b/rhodecode/templates/register.html
@@ -78,7 +78,7 @@
 			                        
 			            <div class="buttons">
 				            <div class="nohighlight">
-				              ${h.submit('sign_up','Sign Up',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+				              ${h.submit('sign_up','Sign Up',class_="ui-button")}
 				              %if c.auto_active:
 							  	<div class="activation_msg">${_('Your account will be activated right after registration')}</div>
 							  %else:
diff --git a/rhodecode/templates/search/search.html b/rhodecode/templates/search/search.html
--- a/rhodecode/templates/search/search.html
+++ b/rhodecode/templates/search/search.html
@@ -43,7 +43,7 @@
              </div> 			
 				<div class="input">${h.text('q',c.cur_query,class_="small")}
 					<div class="button highlight">
-						<input type="submit" value="${_('Search')}" class="ui-button ui-widget ui-state-default ui-corner-all"/>
+						<input type="submit" value="${_('Search')}" class="ui-button"/>
 					</div>
 				</div>
 				<div style="font-weight: bold;clear:Both;margin-left:200px">${c.runtime}</div>		
diff --git a/rhodecode/templates/settings/repo_fork.html b/rhodecode/templates/settings/repo_fork.html
--- a/rhodecode/templates/settings/repo_fork.html
+++ b/rhodecode/templates/settings/repo_fork.html
@@ -50,7 +50,7 @@
                 </div>
              </div>
 	        <div class="buttons">
-	          ${h.submit('','fork this repository',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+	          ${h.submit('','fork this repository',class_="ui-button")}
 	        </div>                                                          
         </div>
     </div>    
diff --git a/rhodecode/templates/settings/repo_settings.html b/rhodecode/templates/settings/repo_settings.html
--- a/rhodecode/templates/settings/repo_settings.html
+++ b/rhodecode/templates/settings/repo_settings.html
@@ -128,8 +128,8 @@
              </div>
              
             <div class="buttons">
-              ${h.submit('update','Update',class_="ui-button ui-widget ui-state-default ui-corner-all")}
-              ${h.reset('reset','Reset',class_="ui-button ui-widget ui-state-default ui-corner-all")}
+              ${h.submit('update','Update',class_="ui-button")}
+              ${h.reset('reset','Reset',class_="ui-button")}
             </div>                                                          
         </div>
     </div>