From: Robert Kaiser <robert@notebook.box.kairo.at>
Date: Tue, 23 Dec 2008 18:27:14 +0000 (+0100)
Subject: EarlyBlue 2.0a1 -> 2.0a2 updates, help and messenger parts, also reducing important... 
X-Git-Tag: EarlyBlue-2.0a2~4
X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=d61a45b24b8aab4323df5cdef2fd0c59ecad38ff;p=themes.git

EarlyBlue 2.0a1 -> 2.0a2 updates, help and messenger parts, also reducing important rules in LCARStrek messenger
---

diff --git a/EarlyBlue/communicator/icons/communicatoricons-small.png b/EarlyBlue/communicator/icons/communicatoricons-small.png
index 92354f06..eb9a441c 100644
Binary files a/EarlyBlue/communicator/icons/communicatoricons-small.png and b/EarlyBlue/communicator/icons/communicatoricons-small.png differ
diff --git a/EarlyBlue/communicator/icons/communicatoricons.png b/EarlyBlue/communicator/icons/communicatoricons.png
index 6c8487ec..1ad2e966 100644
Binary files a/EarlyBlue/communicator/icons/communicatoricons.png and b/EarlyBlue/communicator/icons/communicatoricons.png differ
diff --git a/EarlyBlue/help/help.css b/EarlyBlue/help/help.css
index ff4d727e..9bb84962 100644
--- a/EarlyBlue/help/help.css
+++ b/EarlyBlue/help/help.css
@@ -64,10 +64,6 @@
 /* Set the minimum sidebar width so the help contents aren't squeezed together.*/
 #help-sidebar { min-width: 15em; width: 20em; max-width: 25em; }
 
-#search-sidebar-closebutton {
-  list-style-image: url("chrome://global/skin/icons/close-button.gif");
-}
-
 /* ----- BACK BUTTON ----- */
 
 #help-back-button {
diff --git a/EarlyBlue/messenger/accountManage.css b/EarlyBlue/messenger/accountManage.css
index 5a3d52a5..0fc5d6be 100644
--- a/EarlyBlue/messenger/accountManage.css
+++ b/EarlyBlue/messenger/accountManage.css
@@ -66,6 +66,10 @@ treechildren::-moz-tree-cell-text(isDefaultServer-true) {
   font-weight: bold;
 }
 
+#contentFrame {
+  -moz-margin-start: 2px;
+}
+
 /* ::::: SMTP Server Panel :::::: */
 
 .smtpServerListItem {
diff --git a/EarlyBlue/messenger/addressbook/addressbook.css b/EarlyBlue/messenger/addressbook/addressbook.css
index 42b37b0b..f3df503e 100644
--- a/EarlyBlue/messenger/addressbook/addressbook.css
+++ b/EarlyBlue/messenger/addressbook/addressbook.css
@@ -88,11 +88,12 @@
 }
 
 #button-delete {
-  list-style-image:url("chrome://global/skin/icons/icons/trash.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(0px 25px 21px 0px);
 }
 
 #button-delete[disabled="true"] {
-  list-style-image: url("chrome://global/skin/icons/trash-disabled.gif") !important;
+  -moz-image-region: rect(0px 50px 21px 25px);
 }
 
 /* CardView styles - used in the Card View Pane */
diff --git a/EarlyBlue/messenger/addressbook/cardDialog.css b/EarlyBlue/messenger/addressbook/cardDialog.css
index fc05d2f9..ed661dc3 100644
--- a/EarlyBlue/messenger/addressbook/cardDialog.css
+++ b/EarlyBlue/messenger/addressbook/cardDialog.css
@@ -47,19 +47,25 @@
 /* ::::: Card Edit dialog ::::: */
 
 .CardEditWidth {
-  width: 25em;
+  width: 42ch;
 }
 
-.CardEditLabel {
-  padding: 0px;
-  margin-top: 3px;
+.PhoneEditWidth {
+  width: 24ch;
 }
 
-.alignBoxWithFieldset {
-  margin-left: 6px;
-  margin-right: 5px;
+.AddressCardEditWidth {
+  width: 72ch;
+}
+
+.YearWidth {
+  width: 8ch;
 }
 
 .stateZipSpacer {
-  width: 3em;
+  width: 6ch;
+}
+
+.ZipWidth {
+  width: 14ch;
 }
diff --git a/EarlyBlue/messenger/folderMenus.css b/EarlyBlue/messenger/folderMenus.css
index 408ea658..f02801ea 100644
--- a/EarlyBlue/messenger/folderMenus.css
+++ b/EarlyBlue/messenger/folderMenus.css
@@ -51,6 +51,11 @@
   list-style-image: url("chrome://messenger/skin/icons/folder-open.gif");
 }
 
+.folderMenuItem[ServerType="rss"],
+.folderMenuItem[ServerType="nntp"] {
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.png");
+}
+
 /* ..... special folders ..... */
 
 .folderMenuItem[SpecialFolder="Inbox"] {
@@ -117,34 +122,28 @@
   list-style-image: url("chrome://messenger/skin/icons/server-mail.gif");
 }
 
+/* ..... servers ..... */
+
 .folderMenuItem[IsServer="true"][open="true"] {
   list-style-image: url("chrome://messenger/skin/icons/server-mail.gif");
 }
 
-/* IMAP folders */
 .folderMenuItem[IsServer="true"][ServerType="imap"][IsSecure="true"] {
   list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.gif");
 }
 
-/* POP3 folders */
 .folderMenuItem[IsServer="true"][ServerType="pop3"][IsSecure="true"] {
   list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.gif");
 }
 
-/* Local Servers */
 .folderMenuItem[IsServer="true"][ServerType="none"] {
   list-style-image: url("chrome://messenger/skin/icons/server-local.gif");
 }
 
-/* News folders */
-.folderMenuItem[ServerType="nntp"] {
-  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.gif");
+.folderMenuItem[IsServer="true"][ServerType="nntp"] {
+  list-style-image: url("chrome://messenger/skin/icons/server-news.gif");
 }
 
 .folderMenuItem[IsServer="true"][ServerType="nntp"][IsSecure="true"] {
   list-style-image: url("chrome://messenger/skin/icons/server-news-lock.gif");
 }
-
-.folderMenuItem[IsServer="true"][ServerType="nntp"] {
-  list-style-image: url("chrome://messenger/skin/icons/server-news.gif");
-}
diff --git a/EarlyBlue/messenger/folderPane.css b/EarlyBlue/messenger/folderPane.css
index cbd026e2..56c41712 100644
--- a/EarlyBlue/messenger/folderPane.css
+++ b/EarlyBlue/messenger/folderPane.css
@@ -56,6 +56,18 @@ treechildren::-moz-tree-image(folderNameCol, newMessages-true) {
   list-style-image: url("chrome://messenger/skin/icons/folder-new-closed.gif");
 }
 
+/* ..... News and Feeds ..... */
+
+treechildren::-moz-tree-image(folderNameCol, serverType-nntp),
+treechildren::-moz-tree-image(folderNameCol, serverType-rss) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.gif");
+}
+
+treechildren::-moz-tree-image(folderNameCol, serverType-nntp, newMessages-true),
+treechildren::-moz-tree-image(folderNameCol, serverType-rss, newMessages-true) {
+  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup-new.gif");
+}
+
 /* ..... Inbox ..... */
 
 treechildren::-moz-tree-image(folderNameCol, specialFolder-Inbox) {
@@ -116,16 +128,6 @@ treechildren::-moz-tree-image(folderNameCol, specialFolder-Virtual) {
   list-style-image: url("chrome://messenger/skin/icons/folder-search.gif");
 }
 
-treechildren::-moz-tree-image(folderNameCol, isServer-true) {
-  padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/server-mail.gif");
-}
-
-treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
-  padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/server-mail-new.gif");
-}
-
 treechildren::-moz-tree-cell-text(folderNameCol, newMessages-true),
 treechildren::-moz-tree-cell-text(folderNameCol, specialFolder-Inbox, newMessages-true) {
   font-weight: bold;
@@ -138,6 +140,16 @@ treechildren::-moz-tree-image(folderNameCol, imapShared-true) {
 
 /* ..... Server Folders ..... */
 
+treechildren::-moz-tree-image(folderNameCol, isServer-true) {
+  padding-right: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/server-mail.gif");
+}
+
+treechildren::-moz-tree-image(folderNameCol, biffState-NewMail, isServer-true) {
+  padding-right: 2px;
+  list-style-image: url("chrome://messenger/skin/icons/server-mail-new.gif");
+}
+
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-pop3, isSecure-true) {
   padding-right: 2px;
   list-style-image: url("chrome://messenger/skin/icons/server-remote-lock.gif");
@@ -157,13 +169,6 @@ treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-none) {
   list-style-image: url("chrome://messenger/skin/icons/server-local.gif");
 }
 
-/* ..... News Folders ..... */
-
-treechildren::-moz-tree-image(folderNameCol, serverType-nntp) {
-  padding-right: 2px;
-  list-style-image: url("chrome://messenger/skin/icons/folder-newsgroup.gif");
-}
-
 treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp) {
   padding-right: 2px;
   list-style-image: url("chrome://messenger/skin/icons/server-news.gif");
@@ -174,6 +179,10 @@ treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-nntp, isS
   list-style-image: url("chrome://messenger/skin/icons/server-news-lock.gif");
 }
 
+treechildren::-moz-tree-image(folderNameCol, isServer-true, serverType-rss) {
+  list-style-image: url("chrome://communicator/skin/icons/feedIcon16.png");
+}
+
 /* ::::: All Servers ::::: */
 
 treechildren::-moz-tree-cell-text(closed, subfoldersHaveUnreadMessages-true) {
diff --git a/EarlyBlue/messenger/icons/folder-newsgroup-new.gif b/EarlyBlue/messenger/icons/folder-newsgroup-new.gif
new file mode 100644
index 00000000..634e1697
Binary files /dev/null and b/EarlyBlue/messenger/icons/folder-newsgroup-new.gif differ
diff --git a/EarlyBlue/messenger/icons/messengericons-small.png b/EarlyBlue/messenger/icons/messengericons-small.png
new file mode 100644
index 00000000..557518b4
Binary files /dev/null and b/EarlyBlue/messenger/icons/messengericons-small.png differ
diff --git a/EarlyBlue/messenger/icons/messengericons.png b/EarlyBlue/messenger/icons/messengericons.png
new file mode 100644
index 00000000..e56b679f
Binary files /dev/null and b/EarlyBlue/messenger/icons/messengericons.png differ
diff --git a/EarlyBlue/messenger/mailWindow2.css b/EarlyBlue/messenger/mailWindow2.css
deleted file mode 100644
index 7564694d..00000000
--- a/EarlyBlue/messenger/mailWindow2.css
+++ /dev/null
@@ -1,44 +0,0 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is 
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Robert Kaiser <KaiRo@KaiRo.at>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or 
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
-
-/* ===== mailWindow2.css ================================================
-  == Styles for the main Mail window in the optional layout scheme.
-  ======================================================================= */
-
-@import url("chrome://messenger/skin/mailWindow1.css");
-
-@namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
diff --git a/EarlyBlue/messenger/messengercompose/address-disabled.gif b/EarlyBlue/messenger/messengercompose/address-disabled.gif
deleted file mode 100755
index eee7a538..00000000
Binary files a/EarlyBlue/messenger/messengercompose/address-disabled.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/messengercompose/address.gif b/EarlyBlue/messenger/messengercompose/address.gif
deleted file mode 100755
index a6140c73..00000000
Binary files a/EarlyBlue/messenger/messengercompose/address.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/messengercompose/attach-disabled.gif b/EarlyBlue/messenger/messengercompose/attach-disabled.gif
deleted file mode 100755
index 2ee32d5c..00000000
Binary files a/EarlyBlue/messenger/messengercompose/attach-disabled.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/messengercompose/attach.gif b/EarlyBlue/messenger/messengercompose/attach.gif
deleted file mode 100755
index 79568981..00000000
Binary files a/EarlyBlue/messenger/messengercompose/attach.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/messengercompose/messengercompose.css b/EarlyBlue/messenger/messengercompose/messengercompose.css
index b20924d7..fcdec26e 100644
--- a/EarlyBlue/messenger/messengercompose/messengercompose.css
+++ b/EarlyBlue/messenger/messengercompose/messengercompose.css
@@ -47,43 +47,38 @@
 /* ::::: primary toolbar buttons ::::: */
 
 #button-send {
-  list-style-image: url("chrome://messenger/skin/messengercompose/send.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(231px 25px 252px 0px);
 }
 
 #button-send[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/messengercompose/send-disabled.gif") !important;
+  -moz-image-region: rect(231px 50px 252px 25px);
 }
 
 #button-send[offline="true"] {
-  list-style-image: url("chrome://messenger/skin/messengercompose/sendlater.gif");
+  -moz-image-region: rect(273px 25px 294px 0px);
 }
 
 #button-send[offline="true"][disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/messengercompose/sendlater-disabled.gif") !important;
+  -moz-image-region: rect(273px 50px 294px 25px);
 }
 
 #button-address {
-  list-style-image: url("chrome://messenger/skin/messengercompose/address.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(189px 25px 210px 0px);
 }
 
 #button-address[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/messengercompose/address-disabled.gif") !important;
+  -moz-image-region: rect(189px 50px 210px 25px);
 }
 
 #button-attach {
-  list-style-image: url("chrome://messenger/skin/messengercompose/attach.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(210px 25px 231px 0px);
 }
 
 #button-attach[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/messengercompose/attach-disabled.gif") !important;
-}
-
-#button-quote {
-  list-style-image: url("chrome://messenger/skin/messengercompose/quote.gif");
-}
-
-#button-quote[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/messengercompose/quote-disabled.gif") !important;
+  -moz-image-region: rect(210px 50px 231px 25px);
 }
 
 #spellingButton {
@@ -91,23 +86,25 @@
 }
 
 #spellingButton[disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/spell-disabled.gif") !important;
+  list-style-image: url("chrome://editor/skin/icons/spell-disabled.gif");
 }
 
 #button-save {
-  list-style-image: url("chrome://messenger/skin/messengercompose/savemsg.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(294px 25px 315px 0px);
 }
 
 #button-save[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/messengercompose/savemsg-disabled.gif") !important;
+  -moz-image-region: rect(294px 50px 315px 25px);
 }
 
 #button-stop {
-  list-style-image: url("chrome://global/skin/icons/stop.gif");
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(21px 25px 42px 0px);
 }
 
 #button-stop[disabled="true"] {
-  list-style-image: url("chrome://global/skin/icons/stop-disabled.gif") !important;
+  -moz-image-region: rect(21px 50px 42px 25px);
 }
 
 #MsgHeadersToolbar {
diff --git a/EarlyBlue/messenger/messengercompose/quote-disabled.gif b/EarlyBlue/messenger/messengercompose/quote-disabled.gif
deleted file mode 100755
index df7b4f97..00000000
Binary files a/EarlyBlue/messenger/messengercompose/quote-disabled.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/messengercompose/quote.gif b/EarlyBlue/messenger/messengercompose/quote.gif
deleted file mode 100755
index cad2038d..00000000
Binary files a/EarlyBlue/messenger/messengercompose/quote.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/messengercompose/savemsg-disabled.gif b/EarlyBlue/messenger/messengercompose/savemsg-disabled.gif
deleted file mode 100755
index 387bd385..00000000
Binary files a/EarlyBlue/messenger/messengercompose/savemsg-disabled.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/messengercompose/savemsg.gif b/EarlyBlue/messenger/messengercompose/savemsg.gif
deleted file mode 100755
index a373173c..00000000
Binary files a/EarlyBlue/messenger/messengercompose/savemsg.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/messengercompose/send-disabled.gif b/EarlyBlue/messenger/messengercompose/send-disabled.gif
deleted file mode 100755
index 3d220352..00000000
Binary files a/EarlyBlue/messenger/messengercompose/send-disabled.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/messengercompose/send.gif b/EarlyBlue/messenger/messengercompose/send.gif
deleted file mode 100755
index 87ff0249..00000000
Binary files a/EarlyBlue/messenger/messengercompose/send.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/messengercompose/sendlater-disabled.gif b/EarlyBlue/messenger/messengercompose/sendlater-disabled.gif
deleted file mode 100644
index 3408ba2d..00000000
Binary files a/EarlyBlue/messenger/messengercompose/sendlater-disabled.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/messengercompose/sendlater.gif b/EarlyBlue/messenger/messengercompose/sendlater.gif
deleted file mode 100644
index 9131403b..00000000
Binary files a/EarlyBlue/messenger/messengercompose/sendlater.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/primaryToolbar.css b/EarlyBlue/messenger/primaryToolbar.css
index ff790d9f..8c846307 100644
--- a/EarlyBlue/messenger/primaryToolbar.css
+++ b/EarlyBlue/messenger/primaryToolbar.css
@@ -44,51 +44,57 @@
 /* ::::: primary toolbar buttons ::::: */
 
 #button-getmsg {
-  list-style-image: url("chrome://messenger/skin/toolbar/getmsg.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(63px 25px 84px 0px);
 }
 
 #button-getmsg[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/getmsg-disabled.gif") !important;
+  -moz-image-region: rect(63px 50px 84px 25px);
 }
 
 #button-newmsg {
-  list-style-image: url("chrome://messenger/skin/toolbar/newmsg.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(105px 25px 126px 0px);
 }
 
 #button-newmsg[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/newmsg-disabled.gif") !important;
+  -moz-image-region: rect(105px 50px 126px 25px);
 }
 
 #button-reply {
-  list-style-image: url("chrome://messenger/skin/toolbar/reply.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(147px 25px 168px 0px);
 }
 
 #button-reply[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/reply-disabled.gif") !important;
+  -moz-image-region: rect(147px 50px 168px 25px);
 }
 
 #button-replyall {
-  list-style-image: url("chrome://messenger/skin/toolbar/replyall.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(168px 25px 189px 0px);
 }
 
 #button-replyall[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/replyall-disabled.gif") !important;
+  -moz-image-region: rect(168px 50px 189px 25px);
 }
 
 #button-forward {
-  list-style-image: url("chrome://messenger/skin/toolbar/forward.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(42px 25px 63px 0px);
 }
 
 #button-forward[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/forward-disabled.gif") !important;
+  -moz-image-region: rect(42px 50px 63px 25px);
 }
 
 #button-file {
-  list-style-image: url("chrome://messenger/skin/toolbar/file.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(21px 25px 42px 0px);
 }
 
 #button-file[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/file-disabled.gif") !important;
+  -moz-image-region: rect(21px 50px 42px 25px);
 }
 
 #button-goback {
@@ -97,7 +103,7 @@
 }
 
 #button-goback[disabled="true"] {
-  -moz-image-region: rect(42px 50px 63px 25px) !important;
+  -moz-image-region: rect(42px 50px 63px 25px);
 }
 
 #button-goforward {
@@ -106,31 +112,34 @@
 }
 
 #button-goforward[disabled="true"] {
-  -moz-image-region: rect(63px 50px 84px 25px) !important;
+  -moz-image-region: rect(63px 50px 84px 25px);
 }
 
 #button-next {
-  list-style-image: url("chrome://messenger/skin/toolbar/next.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(126px 25px 147px 0px);
 }
 
 #button-next[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/next-disabled.gif") !important;
+  -moz-image-region: rect(126px 50px 147px 25px);
 }
 
 #button-delete {
-  list-style-image: url("chrome://global/skin/icons/trash.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(0px 25px 21px 0px);
 }
 
 #button-delete[disabled="true"] {
-  list-style-image: url("chrome://global/skin/icons/trash-disabled.gif") !important;
+  -moz-image-region: rect(0px 50px 21px 25px);
 }
 
 #button-mark {
-  list-style-image: url("chrome://messenger/skin/toolbar/mark.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(84px 25px 105px 0px);
 }
 
 #button-mark[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/mark-disabled.gif") !important;
+  -moz-image-region: rect(84px 50px 105px 25px);
 }
 
 #button-print {
@@ -139,7 +148,7 @@
 }
 
 #button-print[disabled="true"] {
-  -moz-image-region: rect(0px 50px 21px 25px) !important;
+  -moz-image-region: rect(0px 50px 21px 25px);
 }
 
 #button-stop {
@@ -148,15 +157,144 @@
 }
 
 #button-stop[disabled="true"] {
-  -moz-image-region: rect(21px 50px 42px 25px) !important;
+  -moz-image-region: rect(21px 50px 42px 25px);
 }
 
 #button-junk {
-  list-style-image: url("chrome://messenger/skin/toolbar/junk.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(252px 25px 273px 0px);
 }
 
 #button-junk[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/junk-disabled.gif") !important;
+  -moz-image-region: rect(252px 50px 273px 25px);
+}
+
+/* ::::: small primary toolbar buttons ::::: */
+
+toolbar[iconsize="small"] > #button-getmsg {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(48px 16px 64px 0);
+}
+
+toolbar[iconsize="small"] > #button-getmsg[disabled="true"] {
+  -moz-image-region: rect(48px 32px 64px 16px);
+}
+
+toolbar[iconsize="small"] > #button-newmsg {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(80px 16px 96px 0);
+}
+
+toolbar[iconsize="small"] > #button-newmsg[disabled="true"] {
+  -moz-image-region: rect(80px 32px 96px 16px);
+}
+
+toolbar[iconsize="small"] > #button-reply {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(112px 16px 128px 0);
+}
+
+toolbar[iconsize="small"] > #button-reply[disabled="true"] {
+  -moz-image-region: rect(112px 32px 128px 16px);
+}
+
+toolbar[iconsize="small"] > #button-replyall {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(128px 16px 144px 0);
+}
+
+toolbar[iconsize="small"] > #button-replyall[disabled="true"] {
+  -moz-image-region: rect(128px 32px 144px 16px);
+}
+
+toolbar[iconsize="small"] > #button-forward {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(32px 16px 48px 0);
+}
+
+toolbar[iconsize="small"] > #button-forward[disabled="true"] {
+  -moz-image-region: rect(32px 32px 48px 16px);
+}
+
+toolbar[iconsize="small"] > #button-file {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(16px 16px 32px 0);
+}
+
+toolbar[iconsize="small"] > #button-file[disabled="true"] {
+  -moz-image-region: rect(16px 32px 32px 16px);
+}
+
+toolbar[iconsize="small"] > #button-goback {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(32px 16px 48px 0);
+}
+
+toolbar[iconsize="small"] > #button-goback[disabled="true"] {
+  -moz-image-region: rect(32px 32px 48px 16px);
+}
+
+toolbar[iconsize="small"] > #button-goforward {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(48px 16px 64px 0);
+}
+
+toolbar[iconsize="small"] > #button-goforward[disabled="true"] {
+  -moz-image-region: rect(48px 32px 64px 16px);
+}
+
+toolbar[iconsize="small"] > #button-next {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(96px 16px 112px 0);
+}
+
+toolbar[iconsize="small"] > #button-next[disabled="true"] {
+  -moz-image-region: rect(96px 32px 112px 16px);
+}
+
+toolbar[iconsize="small"] > #button-delete {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(0 16px 16px 0);
+}
+
+toolbar[iconsize="small"] > #button-delete[disabled="true"] {
+  -moz-image-region: rect(0 32px 16px 16px);
+}
+
+toolbar[iconsize="small"] > #button-mark {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(64px 16px 80px 0);
+}
+
+toolbar[iconsize="small"] > #button-mark[disabled="true"] {
+  -moz-image-region: rect(64px 32px 80px 16px);
+}
+
+toolbar[iconsize="small"] > #button-junk {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(192px 16px 208px 0);
+}
+
+toolbar[iconsize="small"] > #button-junk[disabled="true"] {
+  -moz-image-region: rect(192px 32px 208px 16px);
+}
+
+toolbar[iconsize="small"] > #button-print {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(0 16px 16px 0);
+}
+
+toolbar[iconsize="small"] > #button-print[disabled="true"] {
+  -moz-image-region: rect(0 32px 16px 16px);
+}
+
+toolbar[iconsize="small"] > #button-stop {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
+  -moz-image-region: rect(16px 16px 32px 0);
+}
+
+toolbar[iconsize="small"] > #button-stop[disabled="true"] {
+  -moz-image-region: rect(16px 32px 32px 16px);
 }
 
 /* ::::: message notification bar style rules ::::: */
diff --git a/EarlyBlue/messenger/threadPane.css b/EarlyBlue/messenger/threadPane.css
index ecc2d0c3..9af6500e 100644
--- a/EarlyBlue/messenger/threadPane.css
+++ b/EarlyBlue/messenger/threadPane.css
@@ -236,6 +236,7 @@ treechildren::-moz-tree-image(subjectCol, imapdeleted, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-mail-imapdel-offline.gif");
 }
 
+treechildren::-moz-tree-image(subjectCol, rss),
 treechildren::-moz-tree-image(subjectCol, news) {
   list-style-image: url("chrome://messenger/skin/icons/message-news.gif");
 }
@@ -248,6 +249,7 @@ treechildren::-moz-tree-image(subjectCol, news, attach, offline) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-attach-offline.gif");
 }
 
+treechildren::-moz-tree-image(subjectCol, rss, new),
 treechildren::-moz-tree-image(subjectCol, news, new) {
   list-style-image: url("chrome://messenger/skin/icons/message-news-new.gif");
 }
diff --git a/EarlyBlue/messenger/toolbar/file-disabled.gif b/EarlyBlue/messenger/toolbar/file-disabled.gif
deleted file mode 100755
index 335ab90a..00000000
Binary files a/EarlyBlue/messenger/toolbar/file-disabled.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/toolbar/file.gif b/EarlyBlue/messenger/toolbar/file.gif
deleted file mode 100755
index b50a2228..00000000
Binary files a/EarlyBlue/messenger/toolbar/file.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/toolbar/forward-disabled.gif b/EarlyBlue/messenger/toolbar/forward-disabled.gif
deleted file mode 100755
index e191d36f..00000000
Binary files a/EarlyBlue/messenger/toolbar/forward-disabled.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/toolbar/forward.gif b/EarlyBlue/messenger/toolbar/forward.gif
deleted file mode 100755
index a550b949..00000000
Binary files a/EarlyBlue/messenger/toolbar/forward.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/toolbar/getmsg-disabled.gif b/EarlyBlue/messenger/toolbar/getmsg-disabled.gif
deleted file mode 100755
index fcc34380..00000000
Binary files a/EarlyBlue/messenger/toolbar/getmsg-disabled.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/toolbar/getmsg.gif b/EarlyBlue/messenger/toolbar/getmsg.gif
deleted file mode 100755
index e37420fb..00000000
Binary files a/EarlyBlue/messenger/toolbar/getmsg.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/toolbar/junk-disabled.gif b/EarlyBlue/messenger/toolbar/junk-disabled.gif
deleted file mode 100644
index cc6fac5b..00000000
Binary files a/EarlyBlue/messenger/toolbar/junk-disabled.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/toolbar/junk.gif b/EarlyBlue/messenger/toolbar/junk.gif
deleted file mode 100644
index 6b3794a4..00000000
Binary files a/EarlyBlue/messenger/toolbar/junk.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/toolbar/mark-disabled.gif b/EarlyBlue/messenger/toolbar/mark-disabled.gif
deleted file mode 100644
index 51ea2bc2..00000000
Binary files a/EarlyBlue/messenger/toolbar/mark-disabled.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/toolbar/mark.gif b/EarlyBlue/messenger/toolbar/mark.gif
deleted file mode 100644
index 133d025a..00000000
Binary files a/EarlyBlue/messenger/toolbar/mark.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/toolbar/newmsg-disabled.gif b/EarlyBlue/messenger/toolbar/newmsg-disabled.gif
deleted file mode 100755
index 75c04046..00000000
Binary files a/EarlyBlue/messenger/toolbar/newmsg-disabled.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/toolbar/newmsg.gif b/EarlyBlue/messenger/toolbar/newmsg.gif
deleted file mode 100755
index 0051367f..00000000
Binary files a/EarlyBlue/messenger/toolbar/newmsg.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/toolbar/next-disabled.gif b/EarlyBlue/messenger/toolbar/next-disabled.gif
deleted file mode 100755
index c8f0aeb3..00000000
Binary files a/EarlyBlue/messenger/toolbar/next-disabled.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/toolbar/next.gif b/EarlyBlue/messenger/toolbar/next.gif
deleted file mode 100755
index 5afc26c6..00000000
Binary files a/EarlyBlue/messenger/toolbar/next.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/toolbar/reply-disabled.gif b/EarlyBlue/messenger/toolbar/reply-disabled.gif
deleted file mode 100755
index f2d77d48..00000000
Binary files a/EarlyBlue/messenger/toolbar/reply-disabled.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/toolbar/reply.gif b/EarlyBlue/messenger/toolbar/reply.gif
deleted file mode 100755
index a302695b..00000000
Binary files a/EarlyBlue/messenger/toolbar/reply.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/toolbar/replyall-disabled.gif b/EarlyBlue/messenger/toolbar/replyall-disabled.gif
deleted file mode 100755
index 53ee518b..00000000
Binary files a/EarlyBlue/messenger/toolbar/replyall-disabled.gif and /dev/null differ
diff --git a/EarlyBlue/messenger/toolbar/replyall.gif b/EarlyBlue/messenger/toolbar/replyall.gif
deleted file mode 100755
index 31373dbc..00000000
Binary files a/EarlyBlue/messenger/toolbar/replyall.gif and /dev/null differ
diff --git a/LCARStrek/messenger/messengercompose/messengercompose.css b/LCARStrek/messenger/messengercompose/messengercompose.css
index fa934e65..cfa54cbd 100644
--- a/LCARStrek/messenger/messengercompose/messengercompose.css
+++ b/LCARStrek/messenger/messengercompose/messengercompose.css
@@ -135,13 +135,13 @@
   -moz-image-region: rect(21px 25px 42px 0px);
 }
 
-#button-stop:hover,
-#button-stop:hover:active {
+#button-stop:not([disabled="true"]):hover,
+#button-stop:not([disabled="true"]):hover:active {
   -moz-image-region: rect(21px 75px 42px 50px);
 }
 
 #button-stop[disabled="true"] {
-  -moz-image-region: rect(21px 50px 42px 25px) !important;
+  -moz-image-region: rect(21px 50px 42px 25px);
 }
 
 #MsgHeadersToolbar {
diff --git a/LCARStrek/messenger/primaryToolbar.css b/LCARStrek/messenger/primaryToolbar.css
index e12e21f9..fb752ef9 100644
--- a/LCARStrek/messenger/primaryToolbar.css
+++ b/LCARStrek/messenger/primaryToolbar.css
@@ -137,14 +137,14 @@
   -moz-image-region: rect(42px 25px 63px 0px);
 }
 
-#button-goback:hover,
-#button-goback:hover:active,
+#button-goback:not([disabled="true"]):hover,
+#button-goback:not([disabled="true"]):hover:active,
 #button-goback[open="true"] {
   -moz-image-region: rect(42px 75px 63px 50px);
 }
 
 #button-goback[disabled="true"] {
-  -moz-image-region: rect(42px 50px 63px 25px) !important;
+  -moz-image-region: rect(42px 50px 63px 25px);
 }
 
 #button-goforward {
@@ -152,14 +152,14 @@
   -moz-image-region: rect(63px 25px 84px 0px);
 }
 
-#button-goforward:hover,
-#button-goforward:hover:active,
+#button-goforward:not([disabled="true"]):hover,
+#button-goforward:not([disabled="true"]):hover:active,
 #button-goforward[open="true"] {
   -moz-image-region: rect(63px 75px 84px 50px);
 }
 
 #button-goforward[disabled="true"] {
-  -moz-image-region: rect(63px 50px 84px 25px) !important;
+  -moz-image-region: rect(63px 50px 84px 25px);
 }
 
 #button-next {
@@ -211,14 +211,14 @@
   -moz-image-region: rect(0px 25px 21px 0px);
 }
 
-#button-print:hover,
-#button-print:hover:active,
+#button-print:not([disabled="true"]):hover,
+#button-print:not([disabled="true"]):hover:active,
 #button-print[open="true"] {
   -moz-image-region: rect(0px 75px 21px 50px);
 }
 
 #button-print[disabled="true"] {
-  -moz-image-region: rect(0px 50px 21px 25px) !important;
+  -moz-image-region: rect(0px 50px 21px 25px);
 }
 
 #button-stop {
@@ -226,13 +226,13 @@
   -moz-image-region: rect(21px 25px 42px 0px);
 }
 
-#button-stop:hover,
-#button-stop:hover:active {
+#button-stop:not([disabled="true"]):hover,
+#button-stop:not([disabled="true"]):hover:active {
   -moz-image-region: rect(21px 75px 42px 50px);
 }
 
 #button-stop[disabled="true"] {
-  -moz-image-region: rect(21px 50px 42px 25px) !important;
+  -moz-image-region: rect(21px 50px 42px 25px);
 }
 
 #button-junk {
@@ -257,7 +257,7 @@ toolbar[iconsize="small"] > #button-getmsg {
 }
 
 toolbar[iconsize="small"] > #button-getmsg[disabled="true"] {
-  -moz-image-region: rect(48px 32px 64px 16px) !important;
+  -moz-image-region: rect(48px 32px 64px 16px);
 }
 
 toolbar[iconsize="small"] > #button-getmsg:not([disabled="true"]):hover,
@@ -272,7 +272,7 @@ toolbar[iconsize="small"] > #button-newmsg {
 }
 
 toolbar[iconsize="small"] > #button-newmsg[disabled="true"] {
-  -moz-image-region: rect(80px 32px 96px 16px) !important;
+  -moz-image-region: rect(80px 32px 96px 16px);
 }
 
 toolbar[iconsize="small"] > #button-newmsg:not([disabled="true"]):hover,
@@ -286,7 +286,7 @@ toolbar[iconsize="small"] > #button-reply {
 }
 
 toolbar[iconsize="small"] > #button-reply[disabled="true"] {
-  -moz-image-region: rect(112px 32px 128px 16px) !important;
+  -moz-image-region: rect(112px 32px 128px 16px);
 }
 
 toolbar[iconsize="small"] > #button-reply:not([disabled="true"]):hover,
@@ -301,7 +301,7 @@ toolbar[iconsize="small"] > #button-replyall {
 }
 
 toolbar[iconsize="small"] > #button-replyall[disabled="true"] {
-  -moz-image-region: rect(128px 32px 144px 16px) !important;
+  -moz-image-region: rect(128px 32px 144px 16px);
 }
 
 toolbar[iconsize="small"] > #button-replyall:not([disabled="true"]):hover,
@@ -316,7 +316,7 @@ toolbar[iconsize="small"] > #button-forward {
 }
 
 toolbar[iconsize="small"] > #button-forward[disabled="true"] {
-  -moz-image-region: rect(32px 32px 48px 16px) !important;
+  -moz-image-region: rect(32px 32px 48px 16px);
 }
 
 toolbar[iconsize="small"] > #button-forward:not([disabled="true"]):hover,
@@ -331,7 +331,7 @@ toolbar[iconsize="small"] > #button-file {
 }
 
 toolbar[iconsize="small"] > #button-file[disabled="true"] {
-  -moz-image-region: rect(16px 32px 32px 16px) !important;
+  -moz-image-region: rect(16px 32px 32px 16px);
 }
 
 toolbar[iconsize="small"] > #button-file:not([disabled="true"]):hover,
@@ -346,7 +346,7 @@ toolbar[iconsize="small"] > #button-goback {
 }
 
 toolbar[iconsize="small"] > #button-goback[disabled="true"] {
-  -moz-image-region: rect(32px 32px 48px 16px) !important;
+  -moz-image-region: rect(32px 32px 48px 16px);
 }
 
 toolbar[iconsize="small"] > #button-goback:not([disabled="true"]):hover,
@@ -361,7 +361,7 @@ toolbar[iconsize="small"] > #button-goforward {
 }
 
 toolbar[iconsize="small"] > #button-goforward[disabled="true"] {
-  -moz-image-region: rect(48px 32px 64px 16px) !important;
+  -moz-image-region: rect(48px 32px 64px 16px);
 }
 
 toolbar[iconsize="small"] > #button-goforward:not([disabled="true"]):hover,
@@ -376,7 +376,7 @@ toolbar[iconsize="small"] > #button-next {
 }
 
 toolbar[iconsize="small"] > #button-next[disabled="true"] {
-  -moz-image-region: rect(96px 32px 112px 16px) !important;
+  -moz-image-region: rect(96px 32px 112px 16px);
 }
 
 toolbar[iconsize="small"] > #button-next:not([disabled="true"]):hover,
@@ -391,7 +391,7 @@ toolbar[iconsize="small"] > #button-delete {
 }
 
 toolbar[iconsize="small"] > #button-delete[disabled="true"] {
-  -moz-image-region: rect(0 32px 16px 16px) !important;
+  -moz-image-region: rect(0 32px 16px 16px);
 }
 
 toolbar[iconsize="small"] > #button-delete:not([disabled="true"]):hover,
@@ -405,7 +405,7 @@ toolbar[iconsize="small"] > #button-mark {
 }
 
 toolbar[iconsize="small"] > #button-mark[disabled="true"] {
-  -moz-image-region: rect(64px 32px 80px 16px) !important;
+  -moz-image-region: rect(64px 32px 80px 16px);
 }
 
 toolbar[iconsize="small"] > #button-mark:not([disabled="true"]):hover,
@@ -420,7 +420,7 @@ toolbar[iconsize="small"] > #button-junk {
 }
 
 toolbar[iconsize="small"] > #button-junk[disabled="true"] {
-  -moz-image-region: rect(192px 32px 208px 16px) !important;
+  -moz-image-region: rect(192px 32px 208px 16px);
 }
 
 toolbar[iconsize="small"] > #button-junk:not([disabled="true"]):hover,
@@ -434,7 +434,7 @@ toolbar[iconsize="small"] > #button-print {
 }
 
 toolbar[iconsize="small"] > #button-print[disabled="true"] {
-  -moz-image-region: rect(0 32px 16px 16px) !important;
+  -moz-image-region: rect(0 32px 16px 16px);
 }
 
 toolbar[iconsize="small"] > #button-print:not([disabled="true"]):hover,
@@ -448,7 +448,7 @@ toolbar[iconsize="small"] > #button-stop {
 }
 
 toolbar[iconsize="small"] > #button-stop[disabled="true"] {
-  -moz-image-region: rect(16px 32px 32px 16px) !important;
+  -moz-image-region: rect(16px 32px 32px 16px);
 }
 
 toolbar[iconsize="small"] > #button-stop:not([disabled="true"]):hover,