--- a/mail/themes/qute/mail/addrbook/abContactsPanel-aero.css
+++ b/mail/themes/qute/mail/addrbook/abContactsPanel-aero.css
@@ -58,36 +58,34 @@
 
 button,
 #addressbookList {
   -moz-appearance: none;
   padding: 1px 5px !important;
   background: rgba(151, 152, 153, .05)
               -moz-linear-gradient(rgba(251, 252, 253, .95),
                 rgba(246, 247, 248, .47) 49%, rgba(231, 232, 233, .45) 51%,
-                rgba(225,226,229,.3));
-  border-radius: 4.5px;
+                rgba(225, 226, 229, .3));
+  border-radius: 3.5px;
   border: 1px solid;
-  border-color: rgba(0,0,0,.12) rgba(0,0,0,.19) rgba(0,0,0,.38);
+  border-color: rgba(0, 0, 0, .12) rgba(0, 0, 0, .19) rgba(0, 0, 0, .38);
   box-shadow: 0 0 0 1px rgba(255, 255, 255, .3) inset,
-              0 0 0 2px rgba(255, 255, 255, .1) inset,
-              0 1px 0 rgba(0, 0, 0, .15);
+              0 0 0 2px rgba(255, 255, 255, .1) inset;
   color: black;
   text-shadow: 0 0 3px white;
 }
 
 button:hover,
 #addressbookList:not([open="true"]):hover {
   background-color: hsla(190, 60%, 70%, .5);
   border-color: hsla(190, 50%, 65%, .8) hsla(190, 50%, 50%, .8)
                 hsla(190, 50%, 40%, .8);
-  box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset,
-              0 0 0 2px rgba(255,255,255,.1) inset,
-              0 1px 0 rgba(0,0,0,.1),
-              0 0 5px hsl(190,90%,80%);
+  box-shadow: 0 0 0 1px rgba(255, 255, 255, .3) inset,
+              0 0 0 2px rgba(255, 255, 255, .1) inset,
+              0 0 5px hsl(190, 90%, 80%);
   -moz-transition: background-color .4s ease-in,
                    border-color .3s ease-in,
                    box-shadow .3s ease-in;
 }
 
 button:hover:active,
 #addressbookList[open="true"] {
   background-color: transparent;

--- a/mail/themes/qute/mail/addrbook/addressbook-aero.css
+++ b/mail/themes/qute/mail/addrbook/addressbook-aero.css
@@ -82,23 +82,22 @@ toolbox > toolbar:last-of-type:not(:-moz
 .toolbarbutton-menubutton-button,
 .toolbarbutton-menubutton-dropmarker,
 .toolbarbutton-1 {
   -moz-appearance: none;
   padding: 1px 5px !important;
   background: rgba(151, 152, 153, .05)
               -moz-linear-gradient(rgba(251, 252, 253, .95),
               rgba(246, 247, 248, .47) 49%, rgba(231, 232, 233, .45) 51%,
-              rgba(225,226,229,.3));
-  border-radius: 4.5px;
+              rgba(225, 226, 229, .3));
+  border-radius: 3.5px;
   border: 1px solid;
-  border-color: rgba(0,0,0,.12) rgba(0,0,0,.19) rgba(0,0,0,.38);
+  border-color: rgba(0, 0, 0, .12) rgba(0, 0, 0, .19) rgba(0, 0, 0, .38);
   box-shadow: 0 0 0 1px rgba(255, 255, 255, .3) inset,
-              0 0 0 2px rgba(255, 255, 255, .1) inset,
-              0 1px 0 rgba(0, 0, 0, .15);
+              0 0 0 2px rgba(255, 255, 255, .1) inset;
   color: black;
   text-shadow: 0 0 3px white;
 }
 
 .toolbarbutton-menubutton-dropmarker,
 toolbar[iconsize="small"][mode="icons"] .toolbarbutton-menubutton-button,
 toolbar[iconsize="small"][mode="icons"] .toolbarbutton-1 {
   padding-left: 3px !important;
@@ -162,20 +161,19 @@ toolbar[iconsize="small"][mode="icons"] 
 
 .toolbarbutton-menubutton-button:not([disabled="true"]):not(:active):hover,
 toolbarbutton[type="menu-button"]:not([open="true"]):not(:active):hover >
                   .toolbarbutton-menubutton-dropmarker:not([disabled="true"]),
 .toolbarbutton-1:not([disabled="true"]):not([checked="true"]):not(:active):hover {
   background-color: hsla(190, 60%, 70%, .5);
   border-color: hsla(190, 50%, 65%, .8) hsla(190, 50%, 50%, .8)
                 hsla(190, 50%, 40%, .8);
-  box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset,
-              0 0 0 2px rgba(255,255,255,.1) inset,
-              0 1px 0 rgba(0,0,0,.1),
-              0 0 5px hsl(190,90%,80%);
+  box-shadow: 0 0 0 1px rgba(255, 255, 255, .3) inset,
+              0 0 0 2px rgba(255, 255, 255, .1) inset,
+              0 0 5px hsl(190, 90%, 80%);
   -moz-transition: background-color .4s ease-in,
                    border-color .3s ease-in,
                    box-shadow .3s ease-in;
 }
 
 .toolbarbutton-menubutton-button:not([disabled="true"]):hover:active,
 toolbarbutton[type="menu-button"]:hover:active >
                    .toolbarbutton-menubutton-dropmarker:not([disabled="true"]),
@@ -319,23 +317,28 @@ toolbox[labelalign="end"] > toolbar[mode
 }
 
 /* ::::: Search Textbox ::::: */
 
 #peopleSearchInput {
   -moz-appearance: none;
   background-clip: padding-box;
   border: 1px solid ThreeDDarkShadow;
-  border-radius: 4px;
-  box-shadow: 0 1px 0 rgba(0, 0, 0, .1) inset, 0 1px 0 rgba(255, 255, 255, .4);
+  border-radius: 3.5px;
 }
 
 @media all and (-moz-windows-default-theme) {
   #peopleSearchInput {
-    border-color: rgba(0, 0, 0, .25) rgba(0, 0, 0, .32) rgba(0, 0, 0, .37);
+    border-color:rgba(0, 0, 0, .32);
+  }
+
+  #peopleSearchInput:-moz-lwtheme {
+    background-color: rgba(255, 255, 255, .8);
+    border-color: rgba(0, 0, 0, .32);
+    color: black;
   }
 }
 
 @media all and (-moz-windows-compositor) {
   #peopleSearchInput {
     background-color: rgba(255, 255, 255, .725);
     color: black;
   }

--- a/mail/themes/qute/mail/compose/messengercompose-aero.css
+++ b/mail/themes/qute/mail/compose/messengercompose-aero.css
@@ -88,23 +88,22 @@ toolbar:not(:-moz-lwtheme) {
 .toolbarbutton-menubutton-dropmarker,
 .toolbarbutton-1,
 #headers-box menulist {
   -moz-appearance: none;
   padding: 1px 5px !important;
   background: rgba(151, 152, 153, .05)
               -moz-linear-gradient(rgba(251, 252, 253, .95),
               rgba(246, 247, 248, .47) 49%, rgba(231, 232, 233, .45) 51%,
-              rgba(225,226,229,.3));
-  border-radius: 4.5px;
+              rgba(225, 226, 229, .3));
+  border-radius: 3.5px;
   border: 1px solid;
-  border-color: rgba(0,0,0,.12) rgba(0,0,0,.19) rgba(0,0,0,.38);
+  border-color: rgba(0, 0, 0, .12) rgba(0, 0, 0, .19) rgba(0, 0, 0, .38);
   box-shadow: 0 0 0 1px rgba(255, 255, 255, .3) inset,
-              0 0 0 2px rgba(255, 255, 255, .1) inset,
-              0 1px 0 rgba(0, 0, 0, .15);
+              0 0 0 2px rgba(255, 255, 255, .1) inset;
   color: black;
   text-shadow: 0 0 3px white;
 }
 
 .toolbarbutton-menubutton-dropmarker,
 toolbar[iconsize="small"][mode="icons"] .toolbarbutton-menubutton-button,
 toolbar[iconsize="small"][mode="icons"] .toolbarbutton-1 {
   padding-left: 3px !important;
@@ -173,20 +172,19 @@ toolbar[iconsize="small"][mode="icons"] 
 .toolbarbutton-menubutton-button:not([disabled="true"]):not(:active):hover,
 toolbarbutton[type="menu-button"]:not([open="true"]):not(:active):hover >
                   .toolbarbutton-menubutton-dropmarker:not([disabled="true"]),
 .toolbarbutton-1:not([disabled="true"]):not([checked="true"]):not(:active):hover,
 #headers-box menulist:not([disabled="true"]):not([open="true"]):hover {
   background-color: hsla(190, 60%, 70%, .5);
   border-color: hsla(190, 50%, 65%, .8) hsla(190, 50%, 50%, .8)
                 hsla(190, 50%, 40%, .8);
-  box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset,
-              0 0 0 2px rgba(255,255,255,.1) inset,
-              0 1px 0 rgba(0,0,0,.1),
-              0 0 5px hsl(190,90%,80%);
+  box-shadow: 0 0 0 1px rgba(255, 255, 255, .3) inset,
+              0 0 0 2px rgba(255, 255, 255, .1) inset,
+              0 0 5px hsl(190, 90%, 80%);
   -moz-transition: background-color .4s ease-in,
                    border-color .3s ease-in,
                    box-shadow .3s ease-in;
 }
 
 .toolbarbutton-menubutton-button:not([disabled="true"]):hover:active,
 toolbarbutton[type="menu-button"]:hover:active >
                    .toolbarbutton-menubutton-dropmarker:not([disabled="true"]),

--- a/mail/themes/qute/mail/messenger-aero.css
+++ b/mail/themes/qute/mail/messenger-aero.css
@@ -6,31 +6,36 @@
 
 .toolbarbutton-1[checked="true"] {
   padding: 1px 5px !important;
 }
 
 #searchInput {
   background-clip: padding-box;
   border: 1px solid ThreeDDarkShadow;
-  -moz-border-radius: 4px;
-  box-shadow: 0 1px 0 rgba(0, 0, 0, .1) inset, 0 1px 0 rgba(255, 255, 255, .4);
+  -moz-border-radius: 3.5px;
 }
 
 .foldersTree {
   -moz-appearance: none;
 }
 
 #tabmail-buttons > toolbarbutton {
   margin-top: 3px;
 }
 
 @media all and (-moz-windows-default-theme) {
   #searchInput {
-    border-color: rgba(0, 0, 0, .25) rgba(0, 0, 0, .32) rgba(0, 0, 0, .37);
+    border-color: rgba(0, 0, 0, .32);
+  }
+
+  #searchInput:-moz-lwtheme {
+    background-color: rgba(255, 255, 255, .8);
+    border-color: rgba(0, 0, 0, .32);
+    color: black;
   }
 
   treechildren::-moz-tree-row {
     border: 1px solid transparent;
   }
 
   treechildren::-moz-tree-row(hover) {
     border: 1px solid Highlight;

--- a/mail/themes/qute/mail/primaryToolbar-aero.css
+++ b/mail/themes/qute/mail/primaryToolbar-aero.css
@@ -78,23 +78,22 @@
 .toolbarbutton-menubutton-button,
 .toolbarbutton-menubutton-dropmarker,
 .toolbarbutton-1 {
   -moz-appearance: none;
   padding: 1px 5px !important;
   background: rgba(151, 152, 153, .05)
               -moz-linear-gradient(rgba(251, 252, 253, .95),
               rgba(246, 247, 248, .47) 49%, rgba(231, 232, 233, .45) 51%,
-              rgba(225,226,229,.3));
-  border-radius: 4.5px;
+              rgba(225, 226, 229, .3));
+  border-radius: 3.5px;
   border: 1px solid;
-  border-color: rgba(0,0,0,.12) rgba(0,0,0,.19) rgba(0,0,0,.38);
+  border-color: rgba(0, 0, 0, .12) rgba(0, 0, 0, .19) rgba(0, 0, 0, .38);
   box-shadow: 0 0 0 1px rgba(255, 255, 255, .3) inset,
-              0 0 0 2px rgba(255, 255, 255, .1) inset,
-              0 1px 0 rgba(0, 0, 0, .15);
+              0 0 0 2px rgba(255, 255, 255, .1) inset;
   color: black;
   text-shadow: 0 0 3px white;
 }
 
 .toolbarbutton-menubutton-dropmarker,
 toolbar[iconsize="small"][mode="icons"] .toolbarbutton-menubutton-button,
 toolbar[iconsize="small"][mode="icons"] .toolbarbutton-1 {
   padding-left: 3px !important;
@@ -158,38 +157,37 @@ toolbar[iconsize="small"][mode="icons"] 
 
 .toolbarbutton-menubutton-button:not([disabled="true"]):not(:active):hover,
 toolbarbutton[type="menu-button"]:not([open="true"]):not(:active):hover >
                   .toolbarbutton-menubutton-dropmarker:not([disabled="true"]),
 .toolbarbutton-1:not([disabled="true"]):not([checked="true"]):not(:active):hover {
   background-color: hsla(190, 60%, 70%, .5);
   border-color: hsla(190, 50%, 65%, .8) hsla(190, 50%, 50%, .8)
                 hsla(190, 50%, 40%, .8);
-  box-shadow: 0 0 0 1px rgba(255,255,255,.3) inset,
-              0 0 0 2px rgba(255,255,255,.1) inset,
-              0 1px 0 rgba(0,0,0,.1),
-              0 0 5px hsl(190,90%,80%);
+  box-shadow: 0 0 0 1px rgba(255, 255, 255, .3) inset,
+              0 0 0 2px rgba(255, 255, 255, .1) inset,
+              0 0 5px hsl(190, 90%, 80%);
   -moz-transition: background-color .4s ease-in,
                    border-color .3s ease-in,
                    box-shadow .3s ease-in;
 }
 
 .toolbarbutton-menubutton-button:not([disabled="true"]):hover:active,
 toolbarbutton[type="menu-button"]:hover:active >
                    .toolbarbutton-menubutton-dropmarker:not([disabled="true"]),
 toolbarbutton[type="menu-button"][open="true"] >
                                           .toolbarbutton-menubutton-dropmarker,
 .toolbarbutton-1:not([disabled="true"]):hover:active,
 .toolbarbutton-1[checked="true"],
 .toolbarbutton-1[open="true"] {
   background-color: transparent;
   border-color: rgba(0, 0, 0, .65) rgba(0, 0, 0, .55) rgba(0, 0, 0, .5);
   box-shadow: 0 0 9px rgba(0, 0, 0, .4) inset,
-                   0 0 3px rgba(0, 0, 0, .4) inset,
-                   0 1px 0 rgba(255, 255, 255, .4);
+              0 0 3px rgba(0, 0, 0, .4) inset,
+              0 1px 0 rgba(255, 255, 255, .4);
   text-shadow: none;
 }
 
 .toolbarbutton-1[checked="true"]:not(:active):hover {
   background-color: rgba(90%, 90%, 90%, .4);
   -moz-transition: background-color .4s;
 }
 

--- a/mail/themes/qute/mail/quickFilterBar-aero.css
+++ b/mail/themes/qute/mail/quickFilterBar-aero.css
@@ -220,17 +220,16 @@
 }
 
 /* :::: Filter Textbox :::: */
 
 #qfb-qs-textbox {
   -moz-appearance: none;
   background-clip: padding-box;
   border: 1px solid ThreeDDarkShadow;
-  border-radius: 4px;
-  box-shadow: 0 1px 0 rgba(0, 0, 0, .1) inset, 0 1px 0 rgba(255, 255, 255, .4);
+  border-radius: 3.5px;
 }
 
 @media all and (-moz-windows-default-theme) {
   #qfb-qs-textbox {
-    border-color: rgba(0, 0, 0, .25) rgba(0, 0, 0, .32) rgba(0, 0, 0, .37);
+    border-color: rgba(0, 0, 0, .32);
   }
 }