diff --git a/mozilla/extensions/wallet/cookieviewer/CookieViewer.js b/mozilla/extensions/wallet/cookieviewer/CookieViewer.js
index 3d8f599815c..435ea248181 100644
--- a/mozilla/extensions/wallet/cookieviewer/CookieViewer.js
+++ b/mozilla/extensions/wallet/cookieviewer/CookieViewer.js
@@ -305,6 +305,7 @@ function AddItem(children,cells,prefix,idfier)
   for(var i = 0; i < cells.length; i++)
   {
     var cell  = document.createElement("treecell");
+    cell.setAttribute("class", "propertylist");
     cell.setAttribute("value", cells[i])
     row.appendChild(cell);
   }
diff --git a/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul b/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul
index 6182b8e9934..e381035693e 100644
--- a/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul
+++ b/mozilla/extensions/wallet/cookieviewer/CookieViewer.xul
@@ -23,21 +23,21 @@
 -->
 
 <!-- CHANGE THIS WHEN MOVING FILES -->
-<?xml-stylesheet href="chrome://wallet/skin/CookieViewer.css" type="text/css"?> 
+<?xml-stylesheet href="chrome://wallet/skin/" type="text/css"?> 
 <?xul-overlay href="chrome://global/content/dialogOverlay.xul"?>
 
 <!-- CHANGE THIS WHEN MOVING FILES -->
 <!DOCTYPE window SYSTEM "chrome://wallet/locale/CookieViewer.dtd" >
 
 <window id="cookieviewer"
-        width="410" height="450"
+        class="dialog"
         title="&windowtitle.label;"
         xmlns:html="http://www.w3.org/TR/REC-html40"
         xmlns="http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul"
         align="vertical"
         onload="Startup()">
 
-  <html:script src="CookieViewer.js"/>
+  <html:script src="chrome://wallet/content/CookieViewer.js"/>
 	<html:script language="javascript" src="chrome://global/content/strres.js" />
 
   <tabcontrol flex="100%" align="vertical">
@@ -51,7 +51,8 @@
         <box><html:div>&div.cookiesonsystem.label;</html:div></box>
         <spring style="height: 10px;"/>
         <html:div style="width: 380px;">
-          <tree id="cookietree" style="height: 150px; width: 380px;" align="vertical" 
+          <tree id="cookietree" class="inset" style="height: 150px; width: 380px;" align="vertical" 
+            onselect="ViewCookieSelected(event);"
             onclick="ViewCookieSelected(event)"
             onkeypress="HandleKeyPress(event)">
             <treecol width="30%"/>
@@ -73,27 +74,27 @@
               <html:table width="100%" cellpadding="0" cellspacing="0" border="0">
                 <html:tr>
                   <html:td width="55%">&props.name.label;</html:td>
-                  <html:td><html:input id="ifl_name" readonly="true" type="text" flex="100%" class="dispcell"/></html:td>
+                  <html:td><html:input id="ifl_name" readonly="true" type="text" flex="100%" class="scroll-label"/></html:td>
                 </html:tr>
                 <html:tr>
                   <html:td>&props.value.label;</html:td>
-                  <html:td><html:input id="ifl_value" readonly="true" type="text" flex="100%" class="dispcell"/></html:td>
+                  <html:td><html:input id="ifl_value" readonly="true" type="text" flex="100%" class="scroll-label"/></html:td>
                 </html:tr>
                 <html:tr>
                   <html:td id="ifl_domaintype">&props.domain.label;</html:td>
-                  <html:td><html:input id="ifl_domain" readonly="true" type="text" flex="100%" class="dispcell"/></html:td>
+                  <html:td><html:input id="ifl_domain" readonly="true" type="text" flex="100%" class="scroll-label"/></html:td>
                 </html:tr>
                 <html:tr>
                   <html:td>&props.path.label;</html:td>
-                  <html:td><html:input id="ifl_path" readonly="true" type="text" flex="100%" class="dispcell"/></html:td>
+                  <html:td><html:input id="ifl_path" readonly="true" type="text" flex="100%" class="scroll-label"/></html:td>
                 </html:tr>
                 <html:tr>
                   <html:td>&props.secure.label;</html:td>
-                  <html:td><html:input id="ifl_secure" readonly="true" type="text" flex="100%" class="dispcell"/></html:td>
+                  <html:td><html:input id="ifl_secure" readonly="true" type="text" flex="100%" class="scroll-label"/></html:td>
                 </html:tr>
                 <html:tr>
                   <html:td>&props.expires.label;</html:td>
-                  <html:td><html:input id="ifl_expires" readonly="true" type="text" flex="100%" class="dispcell"/></html:td>
+                  <html:td><html:input id="ifl_expires" readonly="true" type="text" flex="100%" class="scroll-label"/></html:td>
                 </html:tr>
               </html:table>
             </html:div>
@@ -109,7 +110,7 @@
         <html:div>&div.bannedservers.label;</html:div>
         <spring flex="5%"/>
         <html:div flex="100%">
-          <tree id="permissionstree" style="height: 280px; width: 380px;" align="vertical"
+          <tree id="permissionstree" class="inset" style="height: 280px; width: 380px;" align="vertical"
                 onkeypress="if(event.which == 46) gone_p += DeleteItemSelected('permissionstree', 'permtree_', 'permissionslist');"
                 onclick="ViewPermissionSelected();">
             <treehead>
diff --git a/mozilla/extensions/wallet/cookieviewer/MANIFEST_SKIN b/mozilla/extensions/wallet/cookieviewer/MANIFEST_SKIN
index 3976808ab96..2919f0d0c40 100644
--- a/mozilla/extensions/wallet/cookieviewer/MANIFEST_SKIN
+++ b/mozilla/extensions/wallet/cookieviewer/MANIFEST_SKIN
@@ -1 +1,2 @@
 CookieViewer.css
+wallet.css
\ No newline at end of file
diff --git a/mozilla/extensions/wallet/cookieviewer/Makefile.in b/mozilla/extensions/wallet/cookieviewer/Makefile.in
index 4d293ba033f..121fa6dbca8 100644
--- a/mozilla/extensions/wallet/cookieviewer/Makefile.in
+++ b/mozilla/extensions/wallet/cookieviewer/Makefile.in
@@ -46,4 +46,5 @@ install:: $(TARGETS)
 	$(INSTALL) $(srcdir)/CookieViewer.xul $(srcdir)/CookieViewer.js $(DIST)/bin/chrome/wallet/content/default
 	$(INSTALL) $(srcdir)/CookieViewer.properties $(srcdir)/CookieViewer.dtd $(DIST)/bin/chrome/wallet/locale/en-US
 	$(INSTALL) $(srcdir)/CookieViewer.css $(DIST)/bin/chrome/wallet/skin/default
+        $(INSTALL) $(srcdir)/wallet.css $(DIST)/bin/chrome/wallet/skin/default
 
diff --git a/mozilla/extensions/wallet/cookieviewer/makefile.win b/mozilla/extensions/wallet/cookieviewer/makefile.win
index 5141cb86e57..3d79e9a8846 100644
--- a/mozilla/extensions/wallet/cookieviewer/makefile.win
+++ b/mozilla/extensions/wallet/cookieviewer/makefile.win
@@ -56,6 +56,7 @@ clobber::
         rm -f $(DIST)\bin\chrome\wallet\content\default\CookieViewer.xul
         rm -f $(DIST)\bin\chrome\wallet\content\default\CookieViewer.js
         rm -f $(DIST)\bin\chrome\wallet\skin\default\CookieViewer.css
+        rm -f $(DIST)\bin\chrome\wallet\skin\default\wallet.css
         rm -f $(DIST)\bin\chrome\wallet\locale\en-US\CookieViewer.properties
         rm -f $(DIST)\bin\chrome\wallet\locale\en-US\CookieViewer.dtd
 
@@ -63,5 +64,6 @@ install:: $(DLL)
         $(MAKE_INSTALL) CookieViewer.xul $(DIST)\bin\chrome\wallet\content\default
         $(MAKE_INSTALL) CookieViewer.js $(DIST)\bin\chrome\wallet\content\default
         $(MAKE_INSTALL) CookieViewer.css $(DIST)\bin\chrome\wallet\skin\default
+        $(MAKE_INSTALL) wallet.css $(DIST)\bin\chrome\wallet\skin\default
         $(MAKE_INSTALL) CookieViewer.properties $(DIST)\bin\chrome\wallet\locale\en-US
         $(MAKE_INSTALL) CookieViewer.dtd $(DIST)\bin\chrome\wallet\locale\en-US
diff --git a/mozilla/extensions/wallet/cookieviewer/wallet.css b/mozilla/extensions/wallet/cookieviewer/wallet.css
new file mode 100644
index 00000000000..be8569d3549
--- /dev/null
+++ b/mozilla/extensions/wallet/cookieviewer/wallet.css
@@ -0,0 +1 @@
+@import url(chrome://global/skin/);
\ No newline at end of file