diff --git a/UI/WebServerResources/ContactsUI.css b/UI/WebServerResources/ContactsUI.css
index 2b98dc077..e9e3ff35d 100644
--- a/UI/WebServerResources/ContactsUI.css
+++ b/UI/WebServerResources/ContactsUI.css
@@ -95,8 +95,8 @@ table.titletable td.titlecell SELECT
   border-left: 1px solid #fff;
   border-right: 2px solid #222;
   border-bottom: 2px solid #222;
-  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow transparent;
-  -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow transparent;
+  -moz-border-bottom-colors: #000 #9c9a94 transparent;
+  -moz-border-right-colors: #000 #9c9a94 transparent;
   background: #DCDAD5;
 }
 
@@ -141,8 +141,8 @@ UL#contactFolders
   border-left: 2px solid #222;
   border-right: 1px solid #fff;
   border-bottom: 1px solid #fff;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
+  -moz-border-top-colors: #9c9a94 #000;
+  -moz-border-left-colors: #9c9a94 #000;
   overflow: auto; }
 
 UL#contactFolders LI.denied
@@ -324,7 +324,7 @@ DIV.contactSelection
   border-left: 0px;
   border-right: 0px;
   border-bottom: 0px;
-  -moz-border-top-colors: -moz-buttonhoverface;
+  -moz-border-top-colors: #efebe7;
 }
 
 DIV.contactSelection > DIV.calendar
diff --git a/UI/WebServerResources/MailerUI.css b/UI/WebServerResources/MailerUI.css
index d8671249b..777636278 100644
--- a/UI/WebServerResources/MailerUI.css
+++ b/UI/WebServerResources/MailerUI.css
@@ -78,8 +78,8 @@ DIV#folderTreeContent
   border-left: 2px solid #222;
   border-right: 1px solid #fff;
   border-bottom: 1px solid #fff;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow;
+  -moz-border-top-colors: #9c9a94 #000;
+  -moz-border-left-colors: #9c9a94 #000;
   position: absolute;
   color: #000;
   background: #fff;
@@ -188,8 +188,8 @@ table.titletable td.titlecell SELECT
   border-left: 1px solid #fff;
   border-right: 2px solid #222;
   border-bottom: 2px solid #222;
-  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow transparent;
-  -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow transparent;
+  -moz-border-bottom-colors: #000 #9c9a94 transparent;
+  -moz-border-right-colors: #000 #9c9a94 transparent;
   background: #dcdad5;
 }
 
diff --git a/UI/WebServerResources/SchedulerUI.css b/UI/WebServerResources/SchedulerUI.css
index e11c28c72..273ff4257 100644
--- a/UI/WebServerResources/SchedulerUI.css
+++ b/UI/WebServerResources/SchedulerUI.css
@@ -64,8 +64,8 @@ UL#tasksList, UL#calendarList
   border-top: 2px solid #222;
   border-left: 2px solid #222;
   background: #fff;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow transparent;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow transparent;
+  -moz-border-top-colors: #9c9a94 #000 transparent;
+  -moz-border-left-colors: #9c9a94 #000 transparent;
   list-style-type: none;
   list-style-image: none; }
 
diff --git a/UI/WebServerResources/UIxAclEditor.css b/UI/WebServerResources/UIxAclEditor.css
index 9ed9f66c1..c0e4be900 100644
--- a/UI/WebServerResources/UIxAclEditor.css
+++ b/UI/WebServerResources/UIxAclEditor.css
@@ -26,8 +26,8 @@ UL#userList
   border-top: 2px solid #222;
   border-left: 2px solid #222;
   background: #fff;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow transparent;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow transparent;
+  -moz-border-top-colors: #9c9a94 #000 transparent;
+  -moz-border-left-colors: #9c9a94 #000 transparent;
   list-style-type: none;
   list-style-image: none; }
 
diff --git a/UI/WebServerResources/UIxAttendeesEditor.css b/UI/WebServerResources/UIxAttendeesEditor.css
index 865d314dd..6cc9a82a9 100644
--- a/UI/WebServerResources/UIxAttendeesEditor.css
+++ b/UI/WebServerResources/UIxAttendeesEditor.css
@@ -17,8 +17,8 @@ DIV#freeBusyView
   border-left: 2px solid #222;
   border-right: 1px solid #fff;
   border-bottom: 1px solid #fff;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow; }
+  -moz-border-top-colors: #9c9a94 #000;
+  -moz-border-left-colors: #9c9a94 #000; }
 
 TABLE#freeBusy TD,
 TABLE#freeBusy TH
diff --git a/UI/WebServerResources/UIxCalUserRightsEditor.css b/UI/WebServerResources/UIxCalUserRightsEditor.css
index 783e47a64..eaea5734b 100644
--- a/UI/WebServerResources/UIxCalUserRightsEditor.css
+++ b/UI/WebServerResources/UIxCalUserRightsEditor.css
@@ -24,8 +24,8 @@ DIV.calendarUserRights > TABLE
   border-right: 1px solid #fff;
   border-top: 2px solid #222;
   border-left: 2px solid #222;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow transparent;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow transparent; }
+  -moz-border-top-colors: #9c9a94 #000 transparent;
+  -moz-border-left-colors: #9c9a94 #000 transparent; }
 
 DIV.calendarUserRights > TABLE TR.permissions TH
 { color: #00f;
diff --git a/UI/WebServerResources/UIxContactEditor.css b/UI/WebServerResources/UIxContactEditor.css
index ef23927ac..d0205082f 100644
--- a/UI/WebServerResources/UIxContactEditor.css
+++ b/UI/WebServerResources/UIxContactEditor.css
@@ -37,10 +37,10 @@ SPAN.caption
   border-bottom: 2px solid #888;
   border-right: 2px solid #888;
   background-color: #d4d0c8;
-  -moz-border-top-colors: -moz-buttonhoverface ThreeDHighlight;
-  -moz-border-left-colors: -moz-buttonhoverface ThreeDHighlight;
-  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow transparent;
-  -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow transparent; }
+  -moz-border-top-colors: #efebe7 #fff;
+  -moz-border-left-colors: #efebe7 #fff;
+  -moz-border-bottom-colors: #000 #9c9a94 transparent;
+  -moz-border-right-colors: #000 #9c9a94 transparent; }
 
 DIV#buttons
 { visibility: visible;
diff --git a/UI/WebServerResources/UIxContactsUserFolders.css b/UI/WebServerResources/UIxContactsUserFolders.css
index b502613e1..aeb110cfe 100644
--- a/UI/WebServerResources/UIxContactsUserFolders.css
+++ b/UI/WebServerResources/UIxContactsUserFolders.css
@@ -26,8 +26,8 @@ DIV#folders
   border-right: 1px solid #fff;
   border-top: 2px solid #222;
   border-left: 2px solid #222;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow transparent;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow transparent; }
+  -moz-border-top-colors: #9c9a94 #000 transparent;
+  -moz-border-left-colors: #9c9a94 #000 transparent; }
 
 DIV#folders DIV
 { width: auto; }
diff --git a/UI/WebServerResources/UIxContactsUserRightsEditor.css b/UI/WebServerResources/UIxContactsUserRightsEditor.css
index 783e47a64..eaea5734b 100644
--- a/UI/WebServerResources/UIxContactsUserRightsEditor.css
+++ b/UI/WebServerResources/UIxContactsUserRightsEditor.css
@@ -24,8 +24,8 @@ DIV.calendarUserRights > TABLE
   border-right: 1px solid #fff;
   border-top: 2px solid #222;
   border-left: 2px solid #222;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow transparent;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow transparent; }
+  -moz-border-top-colors: #9c9a94 #000 transparent;
+  -moz-border-left-colors: #9c9a94 #000 transparent; }
 
 DIV.calendarUserRights > TABLE TR.permissions TH
 { color: #00f;
diff --git a/UI/WebServerResources/UIxMailEditor.css b/UI/WebServerResources/UIxMailEditor.css
index b7863482b..5bfb95e27 100644
--- a/UI/WebServerResources/UIxMailEditor.css
+++ b/UI/WebServerResources/UIxMailEditor.css
@@ -81,8 +81,8 @@ div#compose_attachments_list
   border-right: 1px solid #fff;
   border-top: 2px solid #222;
   border-left: 2px solid #222;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow transparent;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow transparent;
+  -moz-border-top-colors: #9c9a94 #000 transparent;
+  -moz-border-left-colors: #9c9a94 #000 transparent;
 }
 
 TEXTAREA
diff --git a/UI/WebServerResources/generic.css b/UI/WebServerResources/generic.css
index 1af01b02e..26b9dd42f 100644
--- a/UI/WebServerResources/generic.css
+++ b/UI/WebServerResources/generic.css
@@ -172,8 +172,8 @@ SELECT
   border-top: 2px solid #222;
   border-left: 2px solid #222;
   vertical-align: middle;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow transparent;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow transparent;
+  -moz-border-top-colors: #9c9a94 #000 transparent;
+  -moz-border-left-colors: #9c9a94 #000 transparent;
   margin: 2px;
   padding-right: 1px; }
 
@@ -201,8 +201,8 @@ TEXTAREA, INPUT.textField
   border-right: 1px solid #fff;
   border-top: 2px solid #222;
   border-left: 2px solid #222;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow transparent;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow transparent; }
+  -moz-border-top-colors: #9c9a94 #000 transparent;
+  -moz-border-left-colors: #9c9a94 #000 transparent; }
 
 INPUT.textField
 { line-height: 2em;
@@ -226,8 +226,8 @@ SPAN.toolbarSeparator
   float: left;
   height: 3.8em;
   vertical-align: middle;
-  border-right : 1px solid ThreeDHighlight;
-  border-left : 1px solid ThreeDShadow;
+  border-right : 1px solid #fff;
+  border-left : 1px solid #9c9a94;
   margin: 0px .25em;
   margin-top: 0.125em;
   width: 0px;
@@ -353,8 +353,8 @@ DIV#logConsole
   border-left: 2px solid #fff;
   border-right: 2px solid #999;
   border-bottom: 2px solid #999;
-  -moz-border-top-colors: ThreeDDarkShadow ThreeDShadow transparent;
-  -moz-border-left-colors: ThreeDDarkShadow ThreeDShadow transparent;
+  -moz-border-top-colors: #000 #9c9a94 transparent;
+  -moz-border-left-colors: #000 #9c9a94 transparent;
   font-family: monospace;
   font-weight: bold;
   background-color: #000;
@@ -384,8 +384,8 @@ TD.tbtv_navcell
   border-left: 1px solid #fff;
   border-right: 2px solid #222;
   border-bottom: 2px solid #222;
-  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow transparent;
-  -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow transparent; }
+  -moz-border-bottom-colors: #000 #9c9a94 transparent;
+  -moz-border-right-colors: #000 #9c9a94 transparent; }
 
 TD.tbtv_headercell:active
 { background-color: #DCDAD5;
@@ -491,10 +491,10 @@ DIV.javascriptMessagePseudoWindow
   border-left: 2px solid #fff;
   border-bottom: 2px solid #888;
   border-right: 2px solid #888;
-  -moz-border-top-colors: -moz-buttonhoverface ThreeDHighlight;
-  -moz-border-left-colors: -moz-buttonhoverface ThreeDHighlight;
-  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow transparent;
-  -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow transparent;
+  -moz-border-top-colors: #efebe7 #fff;
+  -moz-border-left-colors: #efebe7 #fff;
+  -moz-border-bottom-colors: #000 #9c9a94 transparent;
+  -moz-border-right-colors: #000 #9c9a94 transparent;
   padding: 1em;
   margin: 0px auto;
   -moz-opacity: 1.0;
@@ -512,16 +512,16 @@ DIV.noJavascriptErrorMessage A
 
 A.button:hover
 { color: inherit;
-  background: -moz-buttonhoverface; }
+  background: #efebe7; }
 
 INPUT.button:active,
 A.button:active
 { color: -moz-buttonhovertext;
   background-color: #c4c2bd;
-  -moz-border-bottom-colors: -moz-buttonhoverface ThreeDHighlight;
-  -moz-border-right-colors: -moz-buttonhoverface ThreeDHighlight;
-  -moz-border-top-colors: ThreeDShadow ThreeDDarkShadow;
-  -moz-border-left-colors: ThreeDShadow ThreeDDarkShadow; }
+  -moz-border-bottom-colors: #efebe7 #fff;
+  -moz-border-right-colors: #efebe7 #fff;
+  -moz-border-top-colors: #9c9a94 #000;
+  -moz-border-left-colors: #9c9a94 #000; }
 
 INPUT.button,
 A.button,
@@ -533,10 +533,10 @@ A[class~="_disabled"].button:active
   border-left: 2px solid #fff;
   border-bottom: 2px solid #888;
   border-right: 2px solid #888;
-  -moz-border-top-colors: -moz-buttonhoverface ThreeDHighlight;
-  -moz-border-left-colors: -moz-buttonhoverface ThreeDHighlight;
-  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow transparent;
-  -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow transparent;
+  -moz-border-top-colors: #efebe7 #fff;
+  -moz-border-left-colors: #efebe7 #fff;
+  -moz-border-bottom-colors: #000 #9c9a94 transparent;
+  -moz-border-right-colors: #000 #9c9a94 transparent;
   text-decoration: none;
   color: inherit; }
 
@@ -580,10 +580,10 @@ DIV.tabsContainer
   border-left: 2px solid #fff;
   border-right: 2px solid #888;
   border-bottom: 2px solid #888;
-  -moz-border-top-colors: -moz-buttonhoverface ThreeDHighlight;
-  -moz-border-left-colors: -moz-buttonhoverface ThreeDHighlight;
-  -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow transparent;
-  -moz-border-bottom-colors: ThreeDDarkShadow ThreeDShadow transparent; }
+  -moz-border-top-colors: #efebe7 #fff;
+  -moz-border-left-colors: #efebe7 #fff;
+  -moz-border-right-colors: #000 #9c9a94 transparent;
+  -moz-border-bottom-colors: #000 #9c9a94 transparent; }
 
 DIV.tabsContainer > UL
 { cursor: default;
@@ -604,16 +604,16 @@ DIV.tabsContainer > UL LI
   border-bottom: 0px solid #fff;
   border-right: 2px solid #888;
   padding-bottom: 1px;
-  -moz-border-top-colors: -moz-buttonhoverface ThreeDHighlight;
-  -moz-border-right-colors: ThreeDDarkShadow ThreeDShadow transparent;
-  -moz-border-bottom-colors: -moz-buttonhoverface ThreeDHighlight;
+  -moz-border-top-colors: #efebe7 #fff;
+  -moz-border-right-colors: #000 #9c9a94 transparent;
+  -moz-border-bottom-colors: #efebe7 #fff;
   color: #000; }
 
 DIV.tabsContainer > UL LI.first,
 DIV.tabsContainer > UL LI.active
 { border-left: 2px solid #fff;
   margin-left: -2px;
-  -moz-border-left-colors: -moz-buttonhoverface ThreeDHighlight; }
+  -moz-border-left-colors: #efebe7 #fff; }
 
 DIV.tabsContainer > UL LI.active
 { z-index: 5;