diff --git a/browser/base/content/tabview/tabview.css b/browser/base/content/tabview/tabview.css
index 5358f36b986..fde132e6eb3 100644
--- a/browser/base/content/tabview/tabview.css
+++ b/browser/base/content/tabview/tabview.css
@@ -199,7 +199,6 @@ body {
 
 /* Search
 ----------------------------------*/
-
 #search{
   position: absolute;
   top: 0px;
@@ -228,7 +227,7 @@ html[dir=rtl] #searchbox {
   position: absolute;
   top: 100px;
   right: 0px;
-  z-index:10;
+  z-index: 10;
 }
 
 html[dir=rtl] #actions {
diff --git a/browser/themes/gnomestripe/browser/tabview/search.png b/browser/themes/gnomestripe/browser/tabview/search.png
index b7c76d55fc3..df7212d78c8 100644
Binary files a/browser/themes/gnomestripe/browser/tabview/search.png and b/browser/themes/gnomestripe/browser/tabview/search.png differ
diff --git a/browser/themes/gnomestripe/browser/tabview/tabview.css b/browser/themes/gnomestripe/browser/tabview/tabview.css
index 2e070e6773c..cef9f6bbfee 100644
--- a/browser/themes/gnomestripe/browser/tabview/tabview.css
+++ b/browser/themes/gnomestripe/browser/tabview/tabview.css
@@ -510,13 +510,11 @@ html[dir=rtl] .iq-resizable-se {
   cursor: default;
   top: 0;
   right: 0;
-  width: 28px;
-  height: 27px;
-  background: -moz-image-rect(url(chrome://browser/skin/tabview/tabview.png), 0, 16, 16, 0) no-repeat scroll 7px 7px #b7b7b7;
-  border-bottom: 1px solid #909090;
-  -moz-border-start: 1px solid #B7B7B7;
-  border-top: 1px solid #CFCFCF;
-  border-radius: 3px 0 0 3px;
+  width: 16px;
+  height: 16px;
+  -moz-margin-end: 7px;
+  margin-top: 7px;
+  background: -moz-image-rect(url(chrome://browser/skin/tabview/tabview.png), 0, 16, 16, 0) no-repeat scroll;
 }
 
 html[dir=rtl] #exit-button {
@@ -527,7 +525,6 @@ html[dir=rtl] #exit-button {
 
 /* Search
 ----------------------------------*/
-
 #search{
   background-color: rgba(0,0,0,.42);
   width: 100%;
@@ -544,16 +541,13 @@ html[dir=rtl] #exit-button {
   border-radius: 0.4em;
   -moz-padding-start: 5px;
   -moz-padding-end: 5px;
-  font-size: 14px;  
+  font-size: 14px;
 }
 
 #actions{
-  width: 30px;
-  height: 30px;
-  background-color: #666;
+  width: 26px;
+  height: 26px;
   border: none;
-  box-shadow: 0px 1px 0px rgba(255,255,255,.5), 0px -1px 0px rgba(0,0,0,.8), inset 6px 6px 9px rgba(0,0,0,.56);
-  opacity: .64;
   text-align: center;
 }
 
@@ -573,12 +567,7 @@ html[dir=rtl] #actions {
   border: none;
   width: 20px;
   height: 20px;
-  margin-top:5px;
-  opacity: .8;  
-}
-
-#actions #searchbutton:hover{
-  opacity: 1.0;
+  margin-top: 3px;
 }
 
 .notMainMatch{
diff --git a/browser/themes/pinstripe/browser/tabview/search.png b/browser/themes/pinstripe/browser/tabview/search.png
index b7c76d55fc3..df7212d78c8 100644
Binary files a/browser/themes/pinstripe/browser/tabview/search.png and b/browser/themes/pinstripe/browser/tabview/search.png differ
diff --git a/browser/themes/pinstripe/browser/tabview/tabview.css b/browser/themes/pinstripe/browser/tabview/tabview.css
index 1f72dc9d0d5..b57330f8d78 100644
--- a/browser/themes/pinstripe/browser/tabview/tabview.css
+++ b/browser/themes/pinstripe/browser/tabview/tabview.css
@@ -501,14 +501,12 @@ html[dir=rtl] .iq-resizable-se {
 #exit-button {
   cursor: default;
   top: 0;
-  right: 0;
-  width: 28px;
-  height: 27px;
-  background: -moz-image-rect(url(chrome://browser/skin/tabview/tabview.png), 0, 20, 20, 0) no-repeat scroll 4px 4px #b7b7b7;
-  border-bottom: 1px solid #909090;
-  -moz-border-start: 1px solid #B7B7B7;
-  border-top: 1px solid #CFCFCF;
-  border-radius: 3px 0 0 3px;
+  right: 1px;
+  width: 20px;
+  height: 20px;
+  -moz-margin-end: 2px;
+  margin-top: 2px;
+  background: -moz-image-rect(url(chrome://browser/skin/tabview/tabview.png), 0, 20, 20, 0) no-repeat scroll;
 }
 
 html[dir=rtl] #exit-button {
@@ -519,11 +517,10 @@ html[dir=rtl] #exit-button {
 
 /* Search
 ----------------------------------*/
-
 #search {
   background-color: rgba(0,0,0,.42);
   width: 100%;
-  height: 100%;  
+  height: 100%;
 }
 
 #searchbox {
@@ -540,12 +537,9 @@ html[dir=rtl] #exit-button {
 }
 
 #actions {
-  width: 30px;
-  height: 30px;
-  background-color: #666;
+  width: 26px;
+  height: 26px;
   border: none;
-  box-shadow: 0px 1px 0px rgba(255,255,255,.5), 0px -1px 0px rgba(0,0,0,.8), inset 6px 6px 13px rgba(0,0,0,.56);
-  opacity: .64;
   text-align: center;
 }
 
@@ -565,12 +559,7 @@ html[dir=rtl] #actions {
   border: none;
   width: 20px;
   height: 20px;
-  margin-top:5px;
-  opacity: .8;  
-}
-
-#actions #searchbutton:hover {
-  opacity: 1.0;
+  margin-top: 3px;
 }
 
 .notMainMatch {
diff --git a/browser/themes/winstripe/browser/tabview/search.png b/browser/themes/winstripe/browser/tabview/search.png
index b7c76d55fc3..df7212d78c8 100644
Binary files a/browser/themes/winstripe/browser/tabview/search.png and b/browser/themes/winstripe/browser/tabview/search.png differ
diff --git a/browser/themes/winstripe/browser/tabview/tabview.css b/browser/themes/winstripe/browser/tabview/tabview.css
index 2512b259f5f..789ee8d12d7 100644
--- a/browser/themes/winstripe/browser/tabview/tabview.css
+++ b/browser/themes/winstripe/browser/tabview/tabview.css
@@ -527,15 +527,13 @@ html[dir=rtl] .iq-resizable-se {
 +----------------------------------*/
 #exit-button {
   cursor: default;
-  top: 0;
+  top: 1px;
   right: 0;
-  width: 28px;
-  height: 27px;
-  background: -moz-image-rect(url(chrome://browser/skin/tabview/tabview.png), 0, 18, 18, 0) no-repeat scroll 4px 4px #b7b7b7;
-  border-bottom: 1px solid #909090;
-  -moz-border-start: 1px solid #B7B7B7;
-  border-top: 1px solid #CFCFCF;
-  border-radius: 3px 0 0 3px;
+  width: 18px;
+  height: 18px;
+  -moz-margin-end: 3px;
+  margin-top: 3px;
+  background: -moz-image-rect(url(chrome://browser/skin/tabview/tabview.png), 0, 18, 18, 0) no-repeat scroll;
 }
 
 html[dir=rtl] #exit-button {
@@ -546,7 +544,6 @@ html[dir=rtl] #exit-button {
 
 /* Search
 ----------------------------------*/
-
 #search{
   background-color: rgba(0,0,0,.42);
   width: 100%;
@@ -563,16 +560,13 @@ html[dir=rtl] #exit-button {
   border-radius: 0.4em;
   -moz-padding-start: 5px;
   -moz-padding-end: 5px;
-  font-size: 14px;  
+  font-size: 14px;
 }
 
 #actions{
-  width: 30px;
-  height: 30px;
-  background-color: #CFDBE8;
+  width: 26px;
+  height: 26px;
   border: none;
-  box-shadow: 0px 1px 0px rgba(255,255,255,.5), 0px -1px 0px rgba(0,0,0,.8), inset 6px 6px 9px rgba(0,0,0,.56);
-  opacity: .64;
   text-align: center;
 }
 
@@ -592,12 +586,7 @@ html[dir=rtl] #actions {
   border: none;
   width: 20px;
   height: 20px;
-  margin-top:5px;
-  opacity: .8;  
-}
-
-#actions #searchbutton:hover{
-  opacity: 1.0;
+  margin-top: 3px;
 }
 
 .notMainMatch{