From: Robert Kaiser <robert@notebook.(none)>
Date: Mon, 12 Oct 2009 19:01:05 +0000 (+0200)
Subject: update LCARStrek for customizable compose window, move smime and editor icons into... 
X-Git-Tag: EarlyBlue-2.1a1~26
X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=4db0b17bb698fe4b248acbf0967a14b908a73319;p=themes.git

update LCARStrek for customizable compose window, move smime and editor icons into merged PNG and provide small versions for them
---

diff --git a/LCARStrek/editor/editorPrimaryToolbar.css b/LCARStrek/editor/editorPrimaryToolbar.css
index 9f621eb6..ca9e4d19 100644
--- a/LCARStrek/editor/editorPrimaryToolbar.css
+++ b/LCARStrek/editor/editorPrimaryToolbar.css
@@ -40,238 +40,226 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #newButton {
-  list-style-image: url("chrome://editor/skin/icons/newfile.gif");
-}
-
-#newButton:hover,
-#newButton:hover:active {
-  list-style-image: url("chrome://editor/skin/icons/newfile-hover.gif");
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(84px 25px 105px 0px);
 }
 
 #newButton[disabled="true"]  {
-  list-style-image: url("chrome://editor/skin/icons/newfile-disabled.gif") !important;
-}
+  -moz-image-region: rect(84px 50px 105px 25px);
+} 
 
-#openButton {
-  list-style-image: url("chrome://editor/skin/icons/openfile.gif");
+#newButton:not([disabled="true"]):hover,
+#newButton:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(84px 75px 105px 50px)
 }
 
-#openButton:hover,
-#openButton:hover:active {
-  list-style-image: url("chrome://editor/skin/icons/openfile-hover.gif");
-}
+#openButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(105px 25px 126px 0px);
+} 
 
 #openButton[disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/openfile-disabled.gif") !important;
-}
+  -moz-image-region: rect(105px 50px 126px 25px);
+} 
 
-#saveButton {
-  list-style-image: url("chrome://editor/skin/icons/savefile.gif");
+#openButton:not([disabled="true"]):hover,
+#openButton:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(105px 75px 126px 50px)
 }
 
-#saveButton:hover,
-#saveButton:hover:active {
-  list-style-image: url("chrome://editor/skin/icons/savefile-hover.gif");
-}
+#saveButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(147px 25px 168px 0px);
+} 
 
 #saveButton[disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/savefile-disabled.gif") !important;
-}
-
-#saveButton[dirty="true"] {
-  list-style-image: url("chrome://editor/skin/icons/savefile-dirty.gif");
+  -moz-image-region: rect(147px 50px 168px 25px);
 }
 
-#saveButton[dirty="true"]:hover,
-#saveButton[dirty="true"]:hover:active {
-  list-style-image: url("chrome://editor/skin/icons/savefile-hover.gif");
-}
-
-#saveButton[dirty="true"][disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/savefile-disabled.gif") !important;
+#saveButton:not([disabled="true"]):hover,
+#saveButton:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(147px 75px 168px 50px)
 }
 
 #publishButton {
-  list-style-image: url("chrome://editor/skin/icons/publish.gif");
-}
-
-#publishButton:hover,
-#publishButton:hover:active {
-  list-style-image: url("chrome://editor/skin/icons/publish-hover.gif");
-}
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(210px 25px 231px 0px);
+} 
 
 #publishButton[disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/publish-disabled.gif") !important;
+  -moz-image-region: rect(210px 50px 231px 25px);
 }
 
-#previewButton {
-  list-style-image: url("chrome://editor/skin/icons/preview.gif");
+#publishButton:not([disabled="true"]):hover,
+#publishButton:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(210px 75px 231px 50px)
 }
 
-#previewButton:hover,
-#previewButton:hover:active {
-  list-style-image: url("chrome://editor/skin/icons/preview-hover.gif");
-}
+#previewButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(126px 25px 147px 0px);
+} 
 
 #previewButton[disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/preview-disabled.gif") !important;
-}
+  -moz-image-region: rect(126px 50px 147px 25px);
+} 
 
-#printButton {
-  list-style-image: url("chrome://global/skin/icons/print.gif");
+#previewButton:not([disabled="true"]):hover,
+#previewButton:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(126px 75px 147px 50px)
 }
 
-#printButton:hover,
-#printButton:hover:active,
-#printButton[open="true"] {
-  list-style-image: url("chrome://global/skin/icons/print-hover.gif");
-}
+#printButton {
+  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
+  -moz-image-region: rect(0px 25px 21px 0px);
+} 
 
 #printButton[disabled="true"] {
-  list-style-image: url("chrome://global/skin/icons/print-disabled.gif") !important;
+  -moz-image-region: rect(0px 50px 21px 25px);
 }
 
-/*
-#findButton {
-  list-style-image: url("chrome://editor/skin/icons/find.gif");
+#printButton:not([disabled="true"]):hover,
+#printButton:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(0px 75px 21px 50px)
 }
 
-#findButton:hover,
-#findButton:hover:active {
-  list-style-image: url("chrome://editor/skin/icons/find-hover.gif");
-}
+#findButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(294px 25px 315px 0px);
+} 
 
 #findButton[disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/find-disabled.gif") !important;
+  -moz-image-region: rect(294px 50px 315px 25px);
 }
-*/
 
-#linkButton {
-  list-style-image: url("chrome://editor/skin/icons/link.gif");
+#findButton:not([disabled="true"]):hover,
+#findButton:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(294px 75px 315px 50px)
 }
 
-#linkButton:hover,
-#linkButton:hover:active {
-  list-style-image: url("chrome://editor/skin/icons/link-hover.gif");
-}
+#linkButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(63px 25px 84px 0px);
+} 
 
 #linkButton[disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/link-disabled.gif") !important;
-}
+  -moz-image-region: rect(63px 50px 84px 25px);
+} 
 
-#imageButton {
-  list-style-image: url("chrome://editor/skin/icons/image.gif");
+#linkButton:not([disabled="true"]):hover,
+#linkButton:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(63px 75px 84px 50px)
 }
 
-#imageButton:hover,
-#imageButton:hover:active {
-  list-style-image: url("chrome://editor/skin/icons/image-hover.gif");
-}
+#imageButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(42px 25px 63px 0px);
+} 
 
 #imageButton[disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/image-disabled.gif") !important;
+  -moz-image-region: rect(42px 50px 63px 25px);
 }
 
-#namedAnchorButton {
-  list-style-image: url("chrome://editor/skin/icons/anchor.gif");
+#imageButton:not([disabled="true"]):hover,
+#imageButton:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(42px 75px 63px 50px)
 }
 
-#namedAnchorButton:hover,
-#namedAnchorButton:hover:active {
-  list-style-image: url("chrome://editor/skin/icons/anchor-hover.gif");
-}
+#namedAnchorButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(0px 25px 21px 0px);
+} 
 
 #namedAnchorButton[disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/anchor-disabled.gif") !important;
-}
+  -moz-image-region: rect(0px 50px 21px 25px);
+} 
 
-#hlineButton {
-  list-style-image: url("chrome://editor/skin/icons/hline.gif");
+#namedAnchorButton:not([disabled="true"]):hover,
+#namedAnchorButton:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(0px 75px 21px 50px)
 }
 
-#hlineButton:hover,
-#hlineButton:hover:active {
-  list-style-image: url("chrome://editor/skin/icons/hline-hover.gif");
-}
+#hlineButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(21px 25px 42px 0px);
+} 
 
 #hlineButton[disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/hline-disabled.gif") !important;
-}
+  -moz-image-region: rect(21px 50px 42px 25px);
+} 
 
-#tableButton {
-  list-style-image: url("chrome://editor/skin/icons/table.gif");
+#hlineButton:not([disabled="true"]):hover,
+#hlineButton:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(21px 75px 42px 50px)
 }
 
-#tableButton:hover,
-#tableButton:hover:active {
-  list-style-image: url("chrome://editor/skin/icons/table-hover.gif");
-}
+#tableButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(189px 25px 210px 0px);
+} 
 
 #tableButton[disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/table-disabled.gif") !important;
+  -moz-image-region: rect(189px 50px 210px 25px);
 }
 
-#spellingButton {
-  list-style-image: url("chrome://editor/skin/icons/spell.gif");
+#tableButton:not([disabled="true"]):hover,
+#tableButton:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(189px 75px 210px 50px)
 }
 
-#spellingButton:hover,
-#spellingButton:hover:active {
-  list-style-image: url("chrome://editor/skin/icons/spell-hover.gif");
+#spellingButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(168px 25px 189px 0px);
 }
 
 #spellingButton[disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/spell-disabled.gif") !important;
+  -moz-image-region: rect(168px 50px 189px 25px);
 }
 
-#cutButton {
-  list-style-image: url("chrome://editor/skin/icons/cut.gif");
+#spellingButton:not([disabled="true"]):hover,
+#spellingButton:not([disabled="true"]):hover:active,
+#spellingButton[open="true"] {
+  -moz-image-region: rect(168px 75px 189px 50px);
 }
 
-#cutButton:hover,
-#cutButton:hover:active {
-  list-style-image: url("chrome://editor/skin/icons/cut-hover.gif");
+#cutButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(231px 25px 252px 0px);
 }
 
 #cutButton[disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/cut-disabled.gif") !important;
+  -moz-image-region: rect(231px 50px 252px 25px);
 }
 
-#copyButton {
-  list-style-image: url("chrome://editor/skin/icons/copy.gif");
+#cutButton:not([disabled="true"]):hover,
+#cutButton:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(231px 75px 251px 50px)
 }
 
-#copyButton:hover,
-#copyButton:hover:active {
-  list-style-image: url("chrome://editor/skin/icons/copy-hover.gif");
+#copyButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(252px 25px 273px 0px);
 }
 
 #copyButton[disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/copy-disabled.gif") !important;
+  -moz-image-region: rect(252px 50px 273px 25px);
 }
 
-#pasteButton {
-  list-style-image: url("chrome://editor/skin/icons/paste.gif");
+#copyButton:not([disabled="true"]):hover,
+#copyButton:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(252px 75px 273px 50px)
 }
 
-#pasteButton:hover,
-#pasteButton:hover:active {
-  list-style-image: url("chrome://editor/skin/icons/paste-hover.gif");
+#pasteButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(273px 25px 294px 0px);
 }
 
 #pasteButton[disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/paste-disabled.gif") !important;
-}
-
-#findButton {
-  list-style-image: url("chrome://editor/skin/icons/find.gif");
+  -moz-image-region: rect(273px 50px 294px 25px);
 }
 
-#findButton:hover,
-#findButton:hover:active {
-  list-style-image: url("chrome://editor/skin/icons/find-hover.gif");
-}
-
-#findButton[disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/find-disabled.gif") !important;
+#pasteButton:not([disabled="true"]):hover,
+#pasteButton:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(273px 75px 294px 50px)
 }
diff --git a/LCARStrek/editor/icons/anchor-disabled.gif b/LCARStrek/editor/icons/anchor-disabled.gif
deleted file mode 100755
index 867986b3..00000000
Binary files a/LCARStrek/editor/icons/anchor-disabled.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/anchor-hover.gif b/LCARStrek/editor/icons/anchor-hover.gif
deleted file mode 100755
index f9c09254..00000000
Binary files a/LCARStrek/editor/icons/anchor-hover.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/anchor.gif b/LCARStrek/editor/icons/anchor.gif
deleted file mode 100755
index bce9f011..00000000
Binary files a/LCARStrek/editor/icons/anchor.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/copy-disabled.gif b/LCARStrek/editor/icons/copy-disabled.gif
deleted file mode 100644
index 4f186074..00000000
Binary files a/LCARStrek/editor/icons/copy-disabled.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/copy-hover.gif b/LCARStrek/editor/icons/copy-hover.gif
deleted file mode 100644
index 403f9293..00000000
Binary files a/LCARStrek/editor/icons/copy-hover.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/copy.gif b/LCARStrek/editor/icons/copy.gif
deleted file mode 100644
index 126d6d36..00000000
Binary files a/LCARStrek/editor/icons/copy.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/cut-disabled.gif b/LCARStrek/editor/icons/cut-disabled.gif
deleted file mode 100644
index c89d16f5..00000000
Binary files a/LCARStrek/editor/icons/cut-disabled.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/cut-hover.gif b/LCARStrek/editor/icons/cut-hover.gif
deleted file mode 100644
index 165122d9..00000000
Binary files a/LCARStrek/editor/icons/cut-hover.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/cut.gif b/LCARStrek/editor/icons/cut.gif
deleted file mode 100644
index ff69138b..00000000
Binary files a/LCARStrek/editor/icons/cut.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/editoricons-small.png b/LCARStrek/editor/icons/editoricons-small.png
new file mode 100644
index 00000000..72ac4970
Binary files /dev/null and b/LCARStrek/editor/icons/editoricons-small.png differ
diff --git a/LCARStrek/editor/icons/editoricons.png b/LCARStrek/editor/icons/editoricons.png
new file mode 100644
index 00000000..1528152e
Binary files /dev/null and b/LCARStrek/editor/icons/editoricons.png differ
diff --git a/LCARStrek/editor/icons/find-disabled.gif b/LCARStrek/editor/icons/find-disabled.gif
deleted file mode 100755
index b2f6542e..00000000
Binary files a/LCARStrek/editor/icons/find-disabled.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/find-hover.gif b/LCARStrek/editor/icons/find-hover.gif
deleted file mode 100755
index 90ef02b6..00000000
Binary files a/LCARStrek/editor/icons/find-hover.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/find.gif b/LCARStrek/editor/icons/find.gif
deleted file mode 100755
index 4e7d6168..00000000
Binary files a/LCARStrek/editor/icons/find.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/hline-disabled.gif b/LCARStrek/editor/icons/hline-disabled.gif
deleted file mode 100755
index 4fcbb3d4..00000000
Binary files a/LCARStrek/editor/icons/hline-disabled.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/hline-hover.gif b/LCARStrek/editor/icons/hline-hover.gif
deleted file mode 100755
index 5860417e..00000000
Binary files a/LCARStrek/editor/icons/hline-hover.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/hline.gif b/LCARStrek/editor/icons/hline.gif
deleted file mode 100755
index d6d926ae..00000000
Binary files a/LCARStrek/editor/icons/hline.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/image-disabled.gif b/LCARStrek/editor/icons/image-disabled.gif
deleted file mode 100755
index cfedb970..00000000
Binary files a/LCARStrek/editor/icons/image-disabled.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/image-hover.gif b/LCARStrek/editor/icons/image-hover.gif
deleted file mode 100755
index 3611d2d7..00000000
Binary files a/LCARStrek/editor/icons/image-hover.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/image.gif b/LCARStrek/editor/icons/image.gif
deleted file mode 100755
index ba0d5e7a..00000000
Binary files a/LCARStrek/editor/icons/image.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/link-disabled.gif b/LCARStrek/editor/icons/link-disabled.gif
deleted file mode 100755
index 8f25efb1..00000000
Binary files a/LCARStrek/editor/icons/link-disabled.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/link-hover.gif b/LCARStrek/editor/icons/link-hover.gif
deleted file mode 100755
index fa1bed34..00000000
Binary files a/LCARStrek/editor/icons/link-hover.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/link.gif b/LCARStrek/editor/icons/link.gif
deleted file mode 100755
index 50751427..00000000
Binary files a/LCARStrek/editor/icons/link.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/newfile-disabled.gif b/LCARStrek/editor/icons/newfile-disabled.gif
deleted file mode 100755
index 2449c3f8..00000000
Binary files a/LCARStrek/editor/icons/newfile-disabled.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/newfile-hover.gif b/LCARStrek/editor/icons/newfile-hover.gif
deleted file mode 100755
index de7d1f85..00000000
Binary files a/LCARStrek/editor/icons/newfile-hover.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/newfile.gif b/LCARStrek/editor/icons/newfile.gif
deleted file mode 100755
index 30baddc4..00000000
Binary files a/LCARStrek/editor/icons/newfile.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/openfile-disabled.gif b/LCARStrek/editor/icons/openfile-disabled.gif
deleted file mode 100755
index dcddfe65..00000000
Binary files a/LCARStrek/editor/icons/openfile-disabled.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/openfile-hover.gif b/LCARStrek/editor/icons/openfile-hover.gif
deleted file mode 100755
index 27538b07..00000000
Binary files a/LCARStrek/editor/icons/openfile-hover.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/openfile.gif b/LCARStrek/editor/icons/openfile.gif
deleted file mode 100755
index f4b6e636..00000000
Binary files a/LCARStrek/editor/icons/openfile.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/paste-disabled.gif b/LCARStrek/editor/icons/paste-disabled.gif
deleted file mode 100644
index 8851b0d1..00000000
Binary files a/LCARStrek/editor/icons/paste-disabled.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/paste-hover.gif b/LCARStrek/editor/icons/paste-hover.gif
deleted file mode 100644
index 8e0d8174..00000000
Binary files a/LCARStrek/editor/icons/paste-hover.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/paste.gif b/LCARStrek/editor/icons/paste.gif
deleted file mode 100644
index a121b7b5..00000000
Binary files a/LCARStrek/editor/icons/paste.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/preview-disabled.gif b/LCARStrek/editor/icons/preview-disabled.gif
deleted file mode 100755
index ab4e0648..00000000
Binary files a/LCARStrek/editor/icons/preview-disabled.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/preview-hover.gif b/LCARStrek/editor/icons/preview-hover.gif
deleted file mode 100755
index dbcdba93..00000000
Binary files a/LCARStrek/editor/icons/preview-hover.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/preview.gif b/LCARStrek/editor/icons/preview.gif
deleted file mode 100755
index e077ed5a..00000000
Binary files a/LCARStrek/editor/icons/preview.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/publish-disabled.gif b/LCARStrek/editor/icons/publish-disabled.gif
deleted file mode 100644
index 8337e93e..00000000
Binary files a/LCARStrek/editor/icons/publish-disabled.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/publish-hover.gif b/LCARStrek/editor/icons/publish-hover.gif
deleted file mode 100644
index a33a217b..00000000
Binary files a/LCARStrek/editor/icons/publish-hover.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/publish.gif b/LCARStrek/editor/icons/publish.gif
deleted file mode 100755
index 2c4667fe..00000000
Binary files a/LCARStrek/editor/icons/publish.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/savefile-dirty.gif b/LCARStrek/editor/icons/savefile-dirty.gif
deleted file mode 100755
index e64dc651..00000000
Binary files a/LCARStrek/editor/icons/savefile-dirty.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/savefile-disabled.gif b/LCARStrek/editor/icons/savefile-disabled.gif
deleted file mode 100755
index 2ccb1bc1..00000000
Binary files a/LCARStrek/editor/icons/savefile-disabled.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/savefile-hover.gif b/LCARStrek/editor/icons/savefile-hover.gif
deleted file mode 100755
index a662daa8..00000000
Binary files a/LCARStrek/editor/icons/savefile-hover.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/savefile.gif b/LCARStrek/editor/icons/savefile.gif
deleted file mode 100755
index 45f7ab7e..00000000
Binary files a/LCARStrek/editor/icons/savefile.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/spell-disabled.gif b/LCARStrek/editor/icons/spell-disabled.gif
deleted file mode 100755
index c74f6734..00000000
Binary files a/LCARStrek/editor/icons/spell-disabled.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/spell-hover.gif b/LCARStrek/editor/icons/spell-hover.gif
deleted file mode 100755
index 8bab05ab..00000000
Binary files a/LCARStrek/editor/icons/spell-hover.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/spell.gif b/LCARStrek/editor/icons/spell.gif
deleted file mode 100755
index 14119916..00000000
Binary files a/LCARStrek/editor/icons/spell.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/table-disabled.gif b/LCARStrek/editor/icons/table-disabled.gif
deleted file mode 100755
index 376b5a7f..00000000
Binary files a/LCARStrek/editor/icons/table-disabled.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/table-hover.gif b/LCARStrek/editor/icons/table-hover.gif
deleted file mode 100755
index 15ca4668..00000000
Binary files a/LCARStrek/editor/icons/table-hover.gif and /dev/null differ
diff --git a/LCARStrek/editor/icons/table.gif b/LCARStrek/editor/icons/table.gif
deleted file mode 100755
index 5ef2b3fc..00000000
Binary files a/LCARStrek/editor/icons/table.gif and /dev/null differ
diff --git a/LCARStrek/messenger/messengercompose/messengercompose.css b/LCARStrek/messenger/messengercompose/messengercompose.css
index b99cb5d9..05bfc8b2 100644
--- a/LCARStrek/messenger/messengercompose/messengercompose.css
+++ b/LCARStrek/messenger/messengercompose/messengercompose.css
@@ -103,16 +103,18 @@
 }
 
 #spellingButton {
-  list-style-image: url("chrome://editor/skin/icons/spell.gif");
+  list-style-image: url("chrome://editor/skin/icons/editoricons.png");
+  -moz-image-region: rect(168px 25px 189px 0px);
 }
 
-#spellingButton:hover,
-#spellingButton:hover:active {
-  list-style-image: url("chrome://editor/skin/icons/spell-hover.gif");
+#spellingButton[disabled="true"] {
+  -moz-image-region: rect(168px 50px 189px 25px);
 }
 
-#spellingButton[disabled="true"] {
-  list-style-image: url("chrome://editor/skin/icons/spell-disabled.gif") !important;
+#spellingButton:not([disabled="true"]):hover,
+#spellingButton:not([disabled="true"]):hover:active,
+#spellingButton[open="true"] {
+  -moz-image-region: rect(168px 75px 189px 50px);
 }
 
 #button-save {
@@ -130,18 +132,97 @@
   -moz-image-region: rect(294px 75px 315px 50px);
 }
 
-#button-stop {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-  -moz-image-region: rect(21px 25px 42px 0px);
+/* ::::: small primary toolbar buttons ::::: */
+
+toolbar[iconsize="small"] > #button-send,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-send {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(176px 16px 192px 0);
+}
+
+toolbar[iconsize="small"] > #button-send[disabled="true"] {
+  -moz-image-region: rect(176px 32px 192px 16px);
+}
+
+toolbar[iconsize="small"] > #button-send:not([disabled="true"]):hover,
+toolbar[iconsize="small"] > #button-send:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(176px 48px 192px 32px);
+}
+
+toolbar[iconsize="small"] > #button-send[offline="true"] {
+  -moz-image-region: rect(208px 16px 224px 0);
+}
+
+toolbar[iconsize="small"] > #button-send[offline="true"][disabled="true"] {
+  -moz-image-region: rect(208px 32px 224px 16px);
+}
+
+toolbar[iconsize="small"] > #button-send[offline="true"]:not([disabled="true"]):hover,
+toolbar[iconsize="small"] > #button-send[offline="true"]:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(208px 48px 2224px 32px);
+}
+
+toolbar[iconsize="small"] > #button-address,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-address {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(144px 16px 160px 0);
+}
+
+toolbar[iconsize="small"] > #button-address[disabled="true"] {
+  -moz-image-region: rect(144px 32px 160px 16px);
+}
+
+toolbar[iconsize="small"] > #button-address:not([disabled="true"]):hover,
+toolbar[iconsize="small"] > #button-address:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(144px 48px 160px 32px);
+}
+
+toolbar[iconsize="small"] > #button-attach,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-attach {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(160px 16px 176px 0);
+}
+
+toolbar[iconsize="small"] > #button-attach[disabled="true"] {
+  -moz-image-region: rect(160px 32px 176px 16px);
+}
+
+toolbar[iconsize="small"] > #button-attach:not([disabled="true"]):hover,
+toolbar[iconsize="small"] > #button-attach:not([disabled="true"]):hover:active,
+toolbar[iconsize="small"] > #button-attach[open="true"] {
+  -moz-image-region: rect(160px 48px 176px 32px);
+}
+
+toolbar[iconsize="small"] > #spellingButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #spellingButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(128px 16px 144px 0);
+}
+
+toolbar[iconsize="small"] > #spellingButton[disabled="true"] {
+  -moz-image-region: rect(128px 32px 144px 16px);
+}
+
+toolbar[iconsize="small"] > #spellingButton:not([disabled="true"]):hover,
+toolbar[iconsize="small"] > #spellingButton:not([disabled="true"]):hover:active,
+toolbar[iconsize="small"] > #spellingButton[open="true"] {
+  -moz-image-region: rect(128px 48px 144px 32px);
+}
+
+toolbar[iconsize="small"] > #button-save,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-save {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
+  -moz-image-region: rect(224px 16px 240px 0);
 }
 
-#button-stop:not([disabled="true"]):hover,
-#button-stop:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(21px 75px 42px 50px);
+toolbar[iconsize="small"] > #button-save[disabled="true"] {
+  -moz-image-region: rect(224px 32px 240px 16px);
 }
 
-#button-stop[disabled="true"] {
-  -moz-image-region: rect(21px 50px 42px 25px);
+toolbar[iconsize="small"] > #button-save:not([disabled="true"]):hover,
+toolbar[iconsize="small"] > #button-save:not([disabled="true"]):hover:active,
+toolbar[iconsize="small"] > #button-save[open="true"] {
+  -moz-image-region: rect(224px 48px 240px 32px);
 }
 
 #MsgHeadersToolbar {
diff --git a/LCARStrek/messenger/smime/icons/key-broken-disabled.gif b/LCARStrek/messenger/smime/icons/key-broken-disabled.gif
deleted file mode 100644
index ae41f9a7..00000000
Binary files a/LCARStrek/messenger/smime/icons/key-broken-disabled.gif and /dev/null differ
diff --git a/LCARStrek/messenger/smime/icons/key-broken-hover.gif b/LCARStrek/messenger/smime/icons/key-broken-hover.gif
deleted file mode 100644
index f43b2fab..00000000
Binary files a/LCARStrek/messenger/smime/icons/key-broken-hover.gif and /dev/null differ
diff --git a/LCARStrek/messenger/smime/icons/key-broken.gif b/LCARStrek/messenger/smime/icons/key-broken.gif
deleted file mode 100644
index 5000231b..00000000
Binary files a/LCARStrek/messenger/smime/icons/key-broken.gif and /dev/null differ
diff --git a/LCARStrek/messenger/smime/icons/key-disabled.gif b/LCARStrek/messenger/smime/icons/key-disabled.gif
deleted file mode 100644
index f14334fe..00000000
Binary files a/LCARStrek/messenger/smime/icons/key-disabled.gif and /dev/null differ
diff --git a/LCARStrek/messenger/smime/icons/key-hover.gif b/LCARStrek/messenger/smime/icons/key-hover.gif
deleted file mode 100644
index 70554818..00000000
Binary files a/LCARStrek/messenger/smime/icons/key-hover.gif and /dev/null differ
diff --git a/LCARStrek/messenger/smime/icons/key.gif b/LCARStrek/messenger/smime/icons/key.gif
deleted file mode 100644
index d798f177..00000000
Binary files a/LCARStrek/messenger/smime/icons/key.gif and /dev/null differ
diff --git a/LCARStrek/messenger/smime/icons/lock-cert-disabled.gif b/LCARStrek/messenger/smime/icons/lock-cert-disabled.gif
deleted file mode 100644
index 783eb9c6..00000000
Binary files a/LCARStrek/messenger/smime/icons/lock-cert-disabled.gif and /dev/null differ
diff --git a/LCARStrek/messenger/smime/icons/lock-cert-hover.gif b/LCARStrek/messenger/smime/icons/lock-cert-hover.gif
deleted file mode 100644
index c0d28552..00000000
Binary files a/LCARStrek/messenger/smime/icons/lock-cert-hover.gif and /dev/null differ
diff --git a/LCARStrek/messenger/smime/icons/lock-cert.gif b/LCARStrek/messenger/smime/icons/lock-cert.gif
deleted file mode 100644
index e6a9579a..00000000
Binary files a/LCARStrek/messenger/smime/icons/lock-cert.gif and /dev/null differ
diff --git a/LCARStrek/messenger/smime/icons/lock-disabled.gif b/LCARStrek/messenger/smime/icons/lock-disabled.gif
deleted file mode 100644
index 53b8d8c6..00000000
Binary files a/LCARStrek/messenger/smime/icons/lock-disabled.gif and /dev/null differ
diff --git a/LCARStrek/messenger/smime/icons/lock-hover.gif b/LCARStrek/messenger/smime/icons/lock-hover.gif
deleted file mode 100644
index 07589490..00000000
Binary files a/LCARStrek/messenger/smime/icons/lock-hover.gif and /dev/null differ
diff --git a/LCARStrek/messenger/smime/icons/lock-no-cert-disabled.gif b/LCARStrek/messenger/smime/icons/lock-no-cert-disabled.gif
deleted file mode 100644
index 42e1df0f..00000000
Binary files a/LCARStrek/messenger/smime/icons/lock-no-cert-disabled.gif and /dev/null differ
diff --git a/LCARStrek/messenger/smime/icons/lock-no-cert-hover.gif b/LCARStrek/messenger/smime/icons/lock-no-cert-hover.gif
deleted file mode 100644
index 1dfc51da..00000000
Binary files a/LCARStrek/messenger/smime/icons/lock-no-cert-hover.gif and /dev/null differ
diff --git a/LCARStrek/messenger/smime/icons/lock-no-cert.gif b/LCARStrek/messenger/smime/icons/lock-no-cert.gif
deleted file mode 100644
index 9825a23a..00000000
Binary files a/LCARStrek/messenger/smime/icons/lock-no-cert.gif and /dev/null differ
diff --git a/LCARStrek/messenger/smime/icons/lock.gif b/LCARStrek/messenger/smime/icons/lock.gif
deleted file mode 100644
index 58ff2f2e..00000000
Binary files a/LCARStrek/messenger/smime/icons/lock.gif and /dev/null differ
diff --git a/LCARStrek/messenger/smime/icons/smimeicons-small.png b/LCARStrek/messenger/smime/icons/smimeicons-small.png
new file mode 100644
index 00000000..06ceab8a
Binary files /dev/null and b/LCARStrek/messenger/smime/icons/smimeicons-small.png differ
diff --git a/LCARStrek/messenger/smime/icons/smimeicons.png b/LCARStrek/messenger/smime/icons/smimeicons.png
new file mode 100644
index 00000000..b533cc81
Binary files /dev/null and b/LCARStrek/messenger/smime/icons/smimeicons.png differ
diff --git a/LCARStrek/messenger/smime/msgCompSMIMEOverlay.css b/LCARStrek/messenger/smime/msgCompSMIMEOverlay.css
index 1d6f7a28..114802da 100644
--- a/LCARStrek/messenger/smime/msgCompSMIMEOverlay.css
+++ b/LCARStrek/messenger/smime/msgCompSMIMEOverlay.css
@@ -42,19 +42,35 @@
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
 #button-security {
-  list-style-image: url("chrome://messenger/skin/smime/icons/lock.gif");
+  list-style-image: url("chrome://messenger/skin/smime/icons/smimeicons.png");
+  -moz-image-region: rect(0px 25px 21px 0px);
 }
 
-#button-security:hover,
-#button-security:hover:active,
+#button-security:not([disabled="true"]):hover,
+#button-security:not([disabled="true"]):hover:active,
 #button-security[open="true"] {
-  list-style-image: url("chrome://messenger/skin/smime/icons/lock-hover.gif");
+  -moz-image-region: rect(0px 75px 21px 50px);
 }
 
 #button-security[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/smime/icons/lock-disabled.gif");
+  -moz-image-region: rect(0px 50px 21px 25px);
 }
 
+toolbar[iconsize="small"] > #button-security,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-security {
+  list-style-image: url("chrome://messenger/skin/smime/icons/smimeicons-small.png");
+  -moz-image-region: rect(0 16px 16px 0px);
+}
+
+toolbar[iconsize="small"] > #button-security:not([disabled="true"]):hover,
+toolbar[iconsize="small"] > #button-security:not([disabled="true"]):hover:active,
+toolbar[iconsize="small"] > #button-security[open="true"] {
+  -moz-image-region: rect(0px 48px 16px 32px);
+}
+
+toolbar[iconsize="small"] > #button-security[disabled="true"] {
+  -moz-image-region: rect(0 32px 16px 16px);
+}
 
 #msgcomposeWindow #signing-status {
   list-style-image: none;