From 4db0b17bb698fe4b248acbf0967a14b908a73319 Mon Sep 17 00:00:00 2001
From: Robert Kaiser <robert@notebook.(none)>
Date: Mon, 12 Oct 2009 21:01:05 +0200
Subject: [PATCH] update LCARStrek for customizable compose window, move smime
 and editor icons into merged PNG and provide small versions for them

---
 LCARStrek/editor/editorPrimaryToolbar.css     | 268 +++++++++---------
 LCARStrek/editor/icons/anchor-disabled.gif    | Bin 134 -> 0 bytes
 LCARStrek/editor/icons/anchor-hover.gif       | Bin 134 -> 0 bytes
 LCARStrek/editor/icons/anchor.gif             | Bin 134 -> 0 bytes
 LCARStrek/editor/icons/copy-disabled.gif      | Bin 94 -> 0 bytes
 LCARStrek/editor/icons/copy-hover.gif         | Bin 94 -> 0 bytes
 LCARStrek/editor/icons/copy.gif               | Bin 94 -> 0 bytes
 LCARStrek/editor/icons/cut-disabled.gif       | Bin 95 -> 0 bytes
 LCARStrek/editor/icons/cut-hover.gif          | Bin 95 -> 0 bytes
 LCARStrek/editor/icons/cut.gif                | Bin 95 -> 0 bytes
 LCARStrek/editor/icons/editoricons-small.png  | Bin 0 -> 1413 bytes
 LCARStrek/editor/icons/editoricons.png        | Bin 0 -> 1631 bytes
 LCARStrek/editor/icons/find-disabled.gif      | Bin 149 -> 0 bytes
 LCARStrek/editor/icons/find-hover.gif         | Bin 102 -> 0 bytes
 LCARStrek/editor/icons/find.gif               | Bin 149 -> 0 bytes
 LCARStrek/editor/icons/hline-disabled.gif     | Bin 108 -> 0 bytes
 LCARStrek/editor/icons/hline-hover.gif        | Bin 108 -> 0 bytes
 LCARStrek/editor/icons/hline.gif              | Bin 108 -> 0 bytes
 LCARStrek/editor/icons/image-disabled.gif     | Bin 142 -> 0 bytes
 LCARStrek/editor/icons/image-hover.gif        | Bin 142 -> 0 bytes
 LCARStrek/editor/icons/image.gif              | Bin 142 -> 0 bytes
 LCARStrek/editor/icons/link-disabled.gif      | Bin 137 -> 0 bytes
 LCARStrek/editor/icons/link-hover.gif         | Bin 137 -> 0 bytes
 LCARStrek/editor/icons/link.gif               | Bin 137 -> 0 bytes
 LCARStrek/editor/icons/newfile-disabled.gif   | Bin 145 -> 0 bytes
 LCARStrek/editor/icons/newfile-hover.gif      | Bin 145 -> 0 bytes
 LCARStrek/editor/icons/newfile.gif            | Bin 145 -> 0 bytes
 LCARStrek/editor/icons/openfile-disabled.gif  | Bin 141 -> 0 bytes
 LCARStrek/editor/icons/openfile-hover.gif     | Bin 141 -> 0 bytes
 LCARStrek/editor/icons/openfile.gif           | Bin 141 -> 0 bytes
 LCARStrek/editor/icons/paste-disabled.gif     | Bin 94 -> 0 bytes
 LCARStrek/editor/icons/paste-hover.gif        | Bin 94 -> 0 bytes
 LCARStrek/editor/icons/paste.gif              | Bin 94 -> 0 bytes
 LCARStrek/editor/icons/preview-disabled.gif   | Bin 140 -> 0 bytes
 LCARStrek/editor/icons/preview-hover.gif      | Bin 140 -> 0 bytes
 LCARStrek/editor/icons/preview.gif            | Bin 141 -> 0 bytes
 LCARStrek/editor/icons/publish-disabled.gif   | Bin 94 -> 0 bytes
 LCARStrek/editor/icons/publish-hover.gif      | Bin 94 -> 0 bytes
 LCARStrek/editor/icons/publish.gif            | Bin 94 -> 0 bytes
 LCARStrek/editor/icons/savefile-dirty.gif     | Bin 157 -> 0 bytes
 LCARStrek/editor/icons/savefile-disabled.gif  | Bin 143 -> 0 bytes
 LCARStrek/editor/icons/savefile-hover.gif     | Bin 143 -> 0 bytes
 LCARStrek/editor/icons/savefile.gif           | Bin 143 -> 0 bytes
 LCARStrek/editor/icons/spell-disabled.gif     | Bin 85 -> 0 bytes
 LCARStrek/editor/icons/spell-hover.gif        | Bin 85 -> 0 bytes
 LCARStrek/editor/icons/spell.gif              | Bin 132 -> 0 bytes
 LCARStrek/editor/icons/table-disabled.gif     | Bin 134 -> 0 bytes
 LCARStrek/editor/icons/table-hover.gif        | Bin 134 -> 0 bytes
 LCARStrek/editor/icons/table.gif              | Bin 134 -> 0 bytes
 .../messengercompose/messengercompose.css     | 109 ++++++-
 .../smime/icons/key-broken-disabled.gif       | Bin 91 -> 0 bytes
 .../smime/icons/key-broken-hover.gif          | Bin 91 -> 0 bytes
 .../messenger/smime/icons/key-broken.gif      | Bin 91 -> 0 bytes
 .../messenger/smime/icons/key-disabled.gif    | Bin 94 -> 0 bytes
 LCARStrek/messenger/smime/icons/key-hover.gif | Bin 94 -> 0 bytes
 LCARStrek/messenger/smime/icons/key.gif       | Bin 94 -> 0 bytes
 .../smime/icons/lock-cert-disabled.gif        | Bin 112 -> 0 bytes
 .../messenger/smime/icons/lock-cert-hover.gif | Bin 112 -> 0 bytes
 LCARStrek/messenger/smime/icons/lock-cert.gif | Bin 112 -> 0 bytes
 .../messenger/smime/icons/lock-disabled.gif   | Bin 103 -> 0 bytes
 .../messenger/smime/icons/lock-hover.gif      | Bin 103 -> 0 bytes
 .../smime/icons/lock-no-cert-disabled.gif     | Bin 127 -> 0 bytes
 .../smime/icons/lock-no-cert-hover.gif        | Bin 127 -> 0 bytes
 .../messenger/smime/icons/lock-no-cert.gif    | Bin 127 -> 0 bytes
 LCARStrek/messenger/smime/icons/lock.gif      | Bin 103 -> 0 bytes
 .../smime/icons/smimeicons-small.png          | Bin 0 -> 547 bytes
 .../messenger/smime/icons/smimeicons.png      | Bin 0 -> 619 bytes
 .../messenger/smime/msgCompSMIMEOverlay.css   |  26 +-
 68 files changed, 244 insertions(+), 159 deletions(-)
 delete mode 100755 LCARStrek/editor/icons/anchor-disabled.gif
 delete mode 100755 LCARStrek/editor/icons/anchor-hover.gif
 delete mode 100755 LCARStrek/editor/icons/anchor.gif
 delete mode 100644 LCARStrek/editor/icons/copy-disabled.gif
 delete mode 100644 LCARStrek/editor/icons/copy-hover.gif
 delete mode 100644 LCARStrek/editor/icons/copy.gif
 delete mode 100644 LCARStrek/editor/icons/cut-disabled.gif
 delete mode 100644 LCARStrek/editor/icons/cut-hover.gif
 delete mode 100644 LCARStrek/editor/icons/cut.gif
 create mode 100644 LCARStrek/editor/icons/editoricons-small.png
 create mode 100644 LCARStrek/editor/icons/editoricons.png
 delete mode 100755 LCARStrek/editor/icons/find-disabled.gif
 delete mode 100755 LCARStrek/editor/icons/find-hover.gif
 delete mode 100755 LCARStrek/editor/icons/find.gif
 delete mode 100755 LCARStrek/editor/icons/hline-disabled.gif
 delete mode 100755 LCARStrek/editor/icons/hline-hover.gif
 delete mode 100755 LCARStrek/editor/icons/hline.gif
 delete mode 100755 LCARStrek/editor/icons/image-disabled.gif
 delete mode 100755 LCARStrek/editor/icons/image-hover.gif
 delete mode 100755 LCARStrek/editor/icons/image.gif
 delete mode 100755 LCARStrek/editor/icons/link-disabled.gif
 delete mode 100755 LCARStrek/editor/icons/link-hover.gif
 delete mode 100755 LCARStrek/editor/icons/link.gif
 delete mode 100755 LCARStrek/editor/icons/newfile-disabled.gif
 delete mode 100755 LCARStrek/editor/icons/newfile-hover.gif
 delete mode 100755 LCARStrek/editor/icons/newfile.gif
 delete mode 100755 LCARStrek/editor/icons/openfile-disabled.gif
 delete mode 100755 LCARStrek/editor/icons/openfile-hover.gif
 delete mode 100755 LCARStrek/editor/icons/openfile.gif
 delete mode 100644 LCARStrek/editor/icons/paste-disabled.gif
 delete mode 100644 LCARStrek/editor/icons/paste-hover.gif
 delete mode 100644 LCARStrek/editor/icons/paste.gif
 delete mode 100755 LCARStrek/editor/icons/preview-disabled.gif
 delete mode 100755 LCARStrek/editor/icons/preview-hover.gif
 delete mode 100755 LCARStrek/editor/icons/preview.gif
 delete mode 100644 LCARStrek/editor/icons/publish-disabled.gif
 delete mode 100644 LCARStrek/editor/icons/publish-hover.gif
 delete mode 100755 LCARStrek/editor/icons/publish.gif
 delete mode 100755 LCARStrek/editor/icons/savefile-dirty.gif
 delete mode 100755 LCARStrek/editor/icons/savefile-disabled.gif
 delete mode 100755 LCARStrek/editor/icons/savefile-hover.gif
 delete mode 100755 LCARStrek/editor/icons/savefile.gif
 delete mode 100755 LCARStrek/editor/icons/spell-disabled.gif
 delete mode 100755 LCARStrek/editor/icons/spell-hover.gif
 delete mode 100755 LCARStrek/editor/icons/spell.gif
 delete mode 100755 LCARStrek/editor/icons/table-disabled.gif
 delete mode 100755 LCARStrek/editor/icons/table-hover.gif
 delete mode 100755 LCARStrek/editor/icons/table.gif
 delete mode 100644 LCARStrek/messenger/smime/icons/key-broken-disabled.gif
 delete mode 100644 LCARStrek/messenger/smime/icons/key-broken-hover.gif
 delete mode 100644 LCARStrek/messenger/smime/icons/key-broken.gif
 delete mode 100644 LCARStrek/messenger/smime/icons/key-disabled.gif
 delete mode 100644 LCARStrek/messenger/smime/icons/key-hover.gif
 delete mode 100644 LCARStrek/messenger/smime/icons/key.gif
 delete mode 100644 LCARStrek/messenger/smime/icons/lock-cert-disabled.gif
 delete mode 100644 LCARStrek/messenger/smime/icons/lock-cert-hover.gif
 delete mode 100644 LCARStrek/messenger/smime/icons/lock-cert.gif
 delete mode 100644 LCARStrek/messenger/smime/icons/lock-disabled.gif
 delete mode 100644 LCARStrek/messenger/smime/icons/lock-hover.gif
 delete mode 100644 LCARStrek/messenger/smime/icons/lock-no-cert-disabled.gif
 delete mode 100644 LCARStrek/messenger/smime/icons/lock-no-cert-hover.gif
 delete mode 100644 LCARStrek/messenger/smime/icons/lock-no-cert.gif
 delete mode 100644 LCARStrek/messenger/smime/icons/lock.gif
 create mode 100644 LCARStrek/messenger/smime/icons/smimeicons-small.png
 create mode 100644 LCARStrek/messenger/smime/icons/smimeicons.png

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 867986b36c1da42ee23cd28f9ba847c3b1b807ec..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 134
zcmZ?wbhEHb6k!ly*v!Dt5U^qY{{8>||7Rc$DE?$&WME)q&;cn2nZdwfY;eMJ^<InD
zXLqxUFytv^OjFTXDQVRe^>baa)EtSP$Ko~Xw_MAX_<S+TQc^qhi^cp4o-7R306fPb
A-2eap

diff --git a/LCARStrek/editor/icons/anchor-hover.gif b/LCARStrek/editor/icons/anchor-hover.gif
deleted file mode 100755
index f9c092541638d772baefa0755c1702e570906cdf..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 134
zcmZ?wbhEHb6k!ly*vtR|`}gnv|NlRjNtjUl$->CMz{sEjQVKGIfyLP1gy-tL7O&6l
yW*1?|Q_7g8qP0@esw?W}x@4(25<QQ_Yu0bMmM!u5VwR<(cIp?4`4>D{7_0$^=pbDH

diff --git a/LCARStrek/editor/icons/anchor.gif b/LCARStrek/editor/icons/anchor.gif
deleted file mode 100755
index bce9f011686ff63d7e5f4baf73c2bd29a93fcf3f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 134
zcmZ?wbhEHb6k!ly*v!E2|2)I~{rms_|Ia`iQ2fcl$iTqJpaW74GJ}D|*x-cc>b(}P
z&+cXyVaQX;n5Lq&Qqrm`>gT#-sW}ookHu@&Z@HE&@%dtwrKEQ17mN89JXsj50b+(C
AD*ylh

diff --git a/LCARStrek/editor/icons/copy-disabled.gif b/LCARStrek/editor/icons/copy-disabled.gif
deleted file mode 100644
index 4f186074e30cc8e7fe7cb0b705963d8b41413c40..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94
zcmZ?wbhEHb6k!lyXkcJy2-xud|9{1wEQ|~cj0`#qKmd|qU^4CLUwJy0VKGau(e4*5
wjN0=nZm&>W&?$H8nrrN=gYPY-XQ{3a);_72_h?Subgs_F9$M3VTp1ax0gN~yegFUf

diff --git a/LCARStrek/editor/icons/copy-hover.gif b/LCARStrek/editor/icons/copy-hover.gif
deleted file mode 100644
index 403f929347de8611120a79d451c15283f778362e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94
zcmZ?wbhEHb6k!lyXkY+=|Ns9h{$ycfU|?j>0r5dH3{0jy{VPxBGAw54HQN26g;9Hc
t#qAY}3p(X)U2~0{b@08#^eol&!P+Mk^B&E~o6gnw*h6c&k1HdCH2@T7AN~LU

diff --git a/LCARStrek/editor/icons/copy.gif b/LCARStrek/editor/icons/copy.gif
deleted file mode 100644
index 126d6d362980f6efc6bf1622f2fd2f6a77cdeeae..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94
zcmZ?wbhEHb6k!lyXkcLYf1ct0|Nn|VSr{1@7#VaJfB+=Jz+~Ffzw&f0!(x_RqunoB
x7`5kD++Lx$pi}PFHP_f#2j5#v&r)3<tbI~3@6nvR>0F(UJ+!9#xH2+W0|2GRA<O^(

diff --git a/LCARStrek/editor/icons/cut-disabled.gif b/LCARStrek/editor/icons/cut-disabled.gif
deleted file mode 100644
index c89d16f5a51a97a177699c20d53b6e9879207a91..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 95
zcmZ?wbhEHb6k!lyXkcJy2-xud|9{1wEQ|~cj0`#qKmd|qU^46JUwN9FKbgDXYT5a_
xdWE+t6V$pyI~N@5EM1l6E9hc7dD7k;dp{ZO;QCi|NI)>d@n_x{wM7gJ)&Qo-B542s

diff --git a/LCARStrek/editor/icons/cut-hover.gif b/LCARStrek/editor/icons/cut-hover.gif
deleted file mode 100644
index 165122d9adbd81f2dfc185349a61ca64e4a4a757..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 95
zcmZ?wbhEHb6k!lyXkY+=|Ns9h{$ycfU|?j>0r5dH3`}M{{VPv%^CxpRTrE3)SFi9^
uWrA9lXy<}sou#YNd<9)>Cr{eDWA7)!9bEs44haZmIR4B#qqc~F!5RQ9c_8Tk

diff --git a/LCARStrek/editor/icons/cut.gif b/LCARStrek/editor/icons/cut.gif
deleted file mode 100644
index ff69138b6c8cb161ba12e765486f860deee04d7a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 95
zcmZ?wbhEHb6k!lyXkcLYf1ct0|Nn|VSr{1@7#VaJfB+=Jz+~3bzw$IUe=>K&)w1(<
x^$KrQCa86Zb}l&9S-L9CSJ1_F@}#{x_I@(l!S%1`kbq!@<IlV^YKs^ctO3BLBDVkl

diff --git a/LCARStrek/editor/icons/editoricons-small.png b/LCARStrek/editor/icons/editoricons-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..72ac49708fc5ae45a645c127117e9e467ee2ba81
GIT binary patch
literal 1413
zcmV;01$z34P)<h;3K|Lk000e1NJLTq001xm008g;0{{R3JA@CQ00001b5ch_0Itp)
z=>Px#3{Xr|MHc`90001hP_X~c0D!lNJpcdz0d!JMQvg8b*k%9#00Cl4M??UK1szBL
z000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXb?5*P?-;U_Bq000?uMObu0Z*6U5
zZgc=ca%Ew3Wn>_CX>@2HM@dakSAh-}000EQNkl<ZNXN}qO^d5a5IuG)G$QCg+{>(j
zD`B<)6=wDZ^#3%jLVks0CH*S|w}Jc>AzPu}>A7z)Cfwn^5AJ&%vN%-gR9DxjssKMd
z5(@+dcxZt5Y7w3cg7=P=HJ-#6YOf6{V4Ww7y+&JCv=oaNv%zZ<I>{>;PGop*5WiiQ
z@bxqVFAhY-5~^$neEv+%^CbFSd$l82NIj6can#lV#sD3IB3^)S0D=bpgJXFNPuG23
z?mq}R@qslU_)Z=sIY}+FsJx0GUZf5OQ3cH-kkibc_54{)0y%4lzJga{UgNnR!@h0<
z2TFpRAbqk(0zu$80+0YCK)t=rufGn9N{zv33^Jm>qQCDnc7Pc7@Y)?fxqxzklM9Ob
zgzTb`92sgZC-k{Sol-kdGzq1&=ld01ib-Xe_LGEQnxS+LpIIZmM+h$p!I5F2LjkqV
z;O`PLFJvCb+>rT=+Iyw;UR(ktzd66@a{|m8%o~+UpkM+S6CfEPW}}#m&oC%txnv?A
z5-)9><x0zmmUrhf)2F9T?bs~Y4B5ILJxD^h7j@O5MbPrE0~U*IX7F6Bjb-CA+dF!5
zLERm<7P*#pG3FPqO^=8qq!JLmM@s}N70j!T&H>DPoZffZ*#K*o*_fg4y2hz0qQn#>
z=GQ0)GJ@m>kT!!b3A_%mwNq$}4!W-TPHmFa60DY2eFrwpw8Tq1ghSW_O@M>7hrKcT
zUDxd>q}vi+&O>ng;7FV2CG7hlsOx5HDNB3EbF)uV`W(vju+PW+E~TyyJbRuU&lddR
zVcHAR9+-B6Vw$5&_bRDs|2tr9lo_Lvt|OpKsaHk4K3XP8A3+~>V{yAj+4-W9kK?af
zzJk))H8*BVyRLmmf$tvj-QBon1A+|*B+cV!C>O-}fRNo2U|CQO1M;R}LoO@UVZ_+9
zXkm-{VzSH7B}cb^>_mZR3Z%k;jkRZE?ObCW_}TNb<Hu2h)JR>N!x}I9F&uU+*UVup
zqy3nxU7Pw2fB*!}r;PF;S80>_->jzXye=ZCGbO5o-SCgW@1p+sJm74SoK3=W<4Klw
z7P;xYwEJx5i0!O=r>e-7kutgRyVU8;78y*IpiA(!uEpy(W-o1<xG_3W2D);Slwl@@
z(cM!!N1UCCv(tA|wI~W?S%xG@9>6qB&|0Ia9>+mxSL9|y>V(LF0uB^#ptuno6`4?3
z;`zw~z;()S(h1(HNAO01R}#G75qzO8ZONcHgMKa$UXHh8qLtJCO8t-2zq=3j6dM(Z
z+fzRWG36Ulz5#Ym*;xiM4Ai+RNM1qk3Z7eMcdoMw*V%Dv;alJN))&6@(T!U!aq0ln
z!Oh<8XLG)MbRSQaD=jBl-k*IeeGGlvKa_}TL9w8GgDJj3hbL6QJGK_i28wFLpR<8`
zmwk#K3-Bx0ETh@Z+&?|{Prcnge=ncEp6L|dtPann3LZ0k$Y)!hh4mR&ANNNFS61P~
zD)2>07C2{tQx;fG2P^d6c-4+=c8jDqE8%@GXf(+;rNygXc`t}=cd5=7;eQ;TEHf=V
zEj3$nita+Ii&yzaM=eP$NbPZb%=ggrm!PYUC@G4ZqDY-6RtjmPkXk3CuXFehcu0kT
TRHWCB00000NkvXXu0mjfAE<jA

literal 0
HcmV?d00001

diff --git a/LCARStrek/editor/icons/editoricons.png b/LCARStrek/editor/icons/editoricons.png
new file mode 100644
index 0000000000000000000000000000000000000000..1528152ec00a478da0c48f691489e4730ba9c103
GIT binary patch
literal 1631
zcmV-l2B7(gP)<h;3K|Lk000e1NJLTq002t>00BD!0{{R3=yj9~00001b5ch_0Itp)
z=>Px#3{Xr|MKJ&Z0001hP_X~c0C&6hB>(^b0d!JMQvg8b*k%9#00Cl4M??UK1szBL
z000SaNLh0L01FcU01FcV0GgZ_00007bV*G`2iXb?5(_)D-UqJ$00qBEL_t(o!|hm2
zi{e@kt=uFKBoG_SKJ-em3b+-Fp!*2s|A;H`S4giUzarqaq5q1|TOqH`sSMMPXNH-_
z^vA$l>_{I@Zq=<@_f%a)K4SQC#n*0%=Qt#mJa_tZPx(&2w(E+#Thi)R<4*ca%Ponw
z3$Q!`7Op17D==XbVZwB26Z+3I@<bz(HEqm*xdX9HkHvV`?fGtH@A?<oIGtc)GBF!h
z`f@g3#C+-Cv*ZnY4(rMmLbLA7e`@(Vel0aR9am{|oF%Pw{EZ36LgUiPNaJ!6Ps4%)
zEcCCHNS~Q_`V5F&iA{-xhWR&Q4Y9Nw#N=A=-H7jchRKySrnC_f>wIAO?yOi?rG_QM
z_J-BNJTYuaEbML2uF$T0v-_X5-HX8&8*@HKe0rr}7d|tHgal&~j)cOor*Kpzb}`@G
z^WE{1@5Xb8i5pSFmeeaLUVuf95Ew78<8ko|S~$?cgH0C$+dG7CTrP<f1vKoSVHSB{
zm{mLJUPJfN72Wfbn6B*UO4Ykk(3Oa;a5{-QOy_b)qO5H<sFFgJ6nU==qQnZLBBu5d
zztZlMQC?e=XE!(#HCV2ft_FE8$xLT_+#fWiLA6O4DtUg^P|4$?hDw4}NnUXwPlKgA
z?q&QMcbIRF!nGc=aH(D2?CxmScv|*ompo#+4&T<X<2s17#4=*R2VxzIS>B+Sg>_%d
zK55+Z<(|)%4!fB(XJBbPw6^35o;&B@)ggIB3|{2G^Q0tCHE|};#0XfrBqlz1N&_b2
z9wSc<#2&`1TNmZ2GAS>ux8Ujjvl-@(ls6U+Jaup8!@Wp(fp}xXk`9<_fC<;TU<gJG
zf%nPVareOeBzCVJ&HbCNI<B=xb-YYVG+4=^d(k~QHcz_XO}(wCO|Lg-)3kv$t<#cy
z*cI4$nga{Na)6h-aK0zbx3&3_1iI_?4Rp7vE5j0Edt%if_T`7285{kXK@DiXog=LQ
z!FNpSLiS@U>8{_gn)TdguFAeSXFOPMcsm}sZ@gHF@4V78tRp6zZ@qcT%MbsDCvSK?
z#{Qtk(tq^_>>1u`BxqUn^fsu;eajlN7jV`Kl-3I<HY29`0*rM*Grv{L9Z$eETVito
zHbP8GkG)xZ#W`|QoFiG=Inw$&Z&80oz_uPLT)dE0vC%G5Y*_{5#l)NdD@(&<-qHp!
zZ)MmF^GS3h_OKfAWj+HoigvKE922{cmmR@dJs7V;zBsLn@UJqTFT^rp+HMSD%r$3H
zURtgt++SyV`GNi4-QGL)p=(Zd(6y2=_}$o7vim3KpK0BR`nNT`f@JOZ8Cx&lFFG{5
zM=jJ^xwTMRuEji;j%QVPR=WkT{D>xay<rnvNLQfl=h|m$E!$X+c>~tu5qiw^(pnIF
zGJXO}-Fxoc9dV4zcMh)TS!M5C6zIL92)(!Gc`}5xE&AOICt3oY^3NLy%aLR0k-mRn
z%Oz~Nq;I(tyD;_{;#>yfauAypz#`mnRGVZFi(6nWqm9)t=G#T>jW0>}0$%fkQc-XF
zJz}7RftEhd{&j(`^N5!w&lbnam5X?}TH596XEDF!eemQk-$bep+$1iTwXsjin91vy
zyc!tuxx-D$<-AF)>(u~Hb>n8bkx@5R)+^gRp86uxms$6!yr?;Ym)7YIcyscO<URa=
z*V%k0&bRG(*0&3J+)4kH*qK;r*d5--^xg~Jlt*k!yzL;i;2w>*M_#{21$(Y2M}Oso
z?78rRNy~*~T*y1^$8X&?-4E=WaNi^y+_$fF7y9X@;bu+?oi-sy|EG(KxH!-5-RxuY
z9rPfqs0T@lxVY04d%g`Bm-te!M><%4WxwmSG4>;Kd4?a&){OJz8F9{@aNi0h<*)GK
z7QdLdjK7$y>=%=yW#4&X-?<I@yh@l?d*)Teyt*;}a^_#SWd5m2B6rWs-PCf|XM&6M
d;*(zr=s%#!mlf{N*j)es002ovPDHLkV1mK;A(j9D

literal 0
HcmV?d00001

diff --git a/LCARStrek/editor/icons/find-disabled.gif b/LCARStrek/editor/icons/find-disabled.gif
deleted file mode 100755
index b2f6542e37b22270d6eca270574a6c62ef8dfd71..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 149
zcmZ?wbhEHb6k!ly*v!Dt5U^qY{{8>||7Rc$DE?$&WME)q&;cn2nZdx~WN^ZB^<InD
zXN`X(tY8%PoR&~JFIcPAkt6t-bo86G+YRTeUoVxrWAoCwZE=N~CUT+1OS{yfJ0sS~
Q=yj|;)iig58WV#x0I5GH@&Et;

diff --git a/LCARStrek/editor/icons/find-hover.gif b/LCARStrek/editor/icons/find-hover.gif
deleted file mode 100755
index 90ef02b65fb0c5a9f7938d2f0185dcd996551326..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 102
zcmZ?wbhEHb6k!lyXkY+=|Ns9h{$ycfU|?j>0r5dH3{18?{VPwu<(HnZ#cG4WIg_`w
zCC5ZUR2KCvWm=aPG3l-OvKN0>-Cc9+Xa424HtO@)Q-4J`ED~FN%x6~C#8rzK7_0%2
C#V36L

diff --git a/LCARStrek/editor/icons/find.gif b/LCARStrek/editor/icons/find.gif
deleted file mode 100755
index 4e7d61681b0b5366c3cb9c1de4a5bb968ff2bb2f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 149
zcmZ?wbhEHb6k!ly*v!E2|2)I~{rms_|Ia`iQ2fcl$iTqJpaW74GJ}D|$>4<N>b(}P
z&l>+oSivanIW3`dUa(fJBS-Kv>F76Ww;Rq`zg{YL$L6JV+u{l}P2@t2mv*T|cSfv}
Q(d$@ys%h>9H6{jY0Mn2uKmY&$

diff --git a/LCARStrek/editor/icons/hline-disabled.gif b/LCARStrek/editor/icons/hline-disabled.gif
deleted file mode 100755
index 4fcbb3d45e617f2a0032181ff7d9d3ab49454a4a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 108
zcmZ?wbhEHb6k!ly*v!Dt(9p1d|Nj5~|2G6|U?2i0{$ycfU|?j>0jUL<!N4MEaKdx-
cUW?afcmGe&=)0XTFQaNw&g*>zK5h)w0QpxMR{#J2

diff --git a/LCARStrek/editor/icons/hline-hover.gif b/LCARStrek/editor/icons/hline-hover.gif
deleted file mode 100755
index 5860417ebdd21ea47f1199026eda101c41cf365e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 108
zcmZ?wbhEHb6k!ly*v!Dt(9p1d|Nj5~|1%H=6o0ZXGB7YQ=zx@i%wS-VG&te8dauRn
Zv%CK%X!PAqn3qvCDd+XR0v|U9YXEu&7}o#*

diff --git a/LCARStrek/editor/icons/hline.gif b/LCARStrek/editor/icons/hline.gif
deleted file mode 100755
index d6d926ae093c6a68dadc66ecfcf99438adbed2f1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 108
zcmZ?wbhEHb6k!ly*v!C?mUd?U{{8=f;5-8{K=CIFBLf2?gAPbB$P5M+NrMxftM^*G
aKD+yWf=1u%gn1cNlX70~EAVk+um%7e<r=*J

diff --git a/LCARStrek/editor/icons/image-disabled.gif b/LCARStrek/editor/icons/image-disabled.gif
deleted file mode 100755
index cfedb9702f80600df60192dc92b6c1207b576a98..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 142
zcmZ?wbhEHb6k!ly*v!Dt5U^qY{{8>||7Rc$DE?$&WME)q&;cn2nZdwfZE(VK^<InD
zXElE$XfVZzPY`~!GIM90=;?V0Z`Qr7jNdS?edRnKrX`%QuF8Uu+<L{5S2ie1M^-O;
JqsGKw4FH|4B~t(Z

diff --git a/LCARStrek/editor/icons/image-hover.gif b/LCARStrek/editor/icons/image-hover.gif
deleted file mode 100755
index 3611d2d783020c1b3d8868b8fe8d0dacbb411d37..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 142
zcmZ?wbhEHb6k!ly*vtR|`}gnv|NlRjNtjUl$->CMz{sEjQVKGIfyLV3gy-tL7O&50
z{z%YZiW8q8{Ay+9&N|W4^Ag^yds`X5VP5;nc|J@_IAdLv1tYojiY2dXP?nCYUiL<f
HiNP8G-OnS_

diff --git a/LCARStrek/editor/icons/image.gif b/LCARStrek/editor/icons/image.gif
deleted file mode 100755
index ba0d5e7a0f79f31e67a923fc785c556a9c5c0d41..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 142
zcmZ?wbhEHb6k!ly*v!E2|2)I~{rms_|Ia`iQ2fcl$iTqJpaW74GJ}D|+Teue>b(}P
z&uaci&|r!apCJ5dW#-O0(bMx1-mH6D8NXp(`^tGfOiMUpU6lnRx%G-AuWV43j;vnx
JMvaNV8UV%JC7}QS

diff --git a/LCARStrek/editor/icons/link-disabled.gif b/LCARStrek/editor/icons/link-disabled.gif
deleted file mode 100755
index 8f25efb16fa41a122db17d0ed9d33990c93920c6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 137
zcmZ?wbhEHb6k!ly*v!Dt5U^qY{{8>||7Rc$DE?$&WME)q&;cn2nZdwfW^lrD^<InD
zXMeLaeD{3F)|4`H>YA>tjH@<&w4A&+`eMbNU$%G89s7N?%5CNaA*+)<{u4{AIvE(O
E0cEl%ng9R*

diff --git a/LCARStrek/editor/icons/link-hover.gif b/LCARStrek/editor/icons/link-hover.gif
deleted file mode 100755
index fa1bed34d792ca82d1e33b1ce3cd358dbfae5c13..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 137
zcmZ?wbhEHb6k!ly*vtR|`}gnv|NlRjNtjUl$->CMz{sEjQVKGIfyK<=gy-tL7O&6#
zW@-5D`H-zCW#-g1U0WGfZTx6Cd2#f`iaoz<@18sM`)ZZj%nL$RCw=@UmRNN%FjxZs
Dty3o&

diff --git a/LCARStrek/editor/icons/link.gif b/LCARStrek/editor/icons/link.gif
deleted file mode 100755
index 50751427211c8d166a6d505a2605544dc3544b56..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 137
zcmZ?wbhEHb6k!ly*v!E2|2)I~{rms_|Ia`iQ2fcl$iTqJpaW74GJ}D|%;1FQ>b(}P
z&;Dj<`0n|Tttn;Z)HPjO8CPxmXgPUt^u>xjzijWGJNEl(mD|h<LRKez{3n)Jbuutm
F0|1O$DChtH

diff --git a/LCARStrek/editor/icons/newfile-disabled.gif b/LCARStrek/editor/icons/newfile-disabled.gif
deleted file mode 100755
index 2449c3f81c4df882c7a5dca537feb094d444711e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 145
zcmZ?wbhEHb6k!ly*v!Dt5U}CEfdl{l|7Rc$DE?$&WME)q&;cn2nZdwfXK;e^z@8ts
zq;k$hZ>>!*pEO0YaN+b_`RduLUfosQJxfM+o{3L}n#xzZ4GRi8y_U^7lOfpUBG|hB
M&Bar1)07yj0ZeTw8vp<R

diff --git a/LCARStrek/editor/icons/newfile-hover.gif b/LCARStrek/editor/icons/newfile-hover.gif
deleted file mode 100755
index de7d1f852c68d8c5b74c76e99e22f9269f596b66..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 145
zcmZ?wbhEHb6k!ly*vtR|2M!$g|NlRjNtjUl$->CMz{sEjQVKGIfyK_?1m}T0KW<6o
zoQvLCn_xa^ie}-$>AUjPvsb;ktGauZjP5)WpA0pXuXY<26n1(on{_5bu**fTb^n`-
Lr{1P1F<1ithz=;5

diff --git a/LCARStrek/editor/icons/newfile.gif b/LCARStrek/editor/icons/newfile.gif
deleted file mode 100755
index 30baddc4d18bd7983a09f134f8470084993f1a72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 145
zcmZ?wbhEHb6k!ly*v!E2|2)Hi0|);9|Ia`iQ2fcl$iTqJpaW74GJ}D|&fo;+fjvKN
zN#&f2-ddYrK52?(;lk;=^3}6fy}GNqdzOsuJQJS`HI=V+8x|CHdM%rECPT2xMX+`M
Nn~SI3rYSL40|0e~Dro=!

diff --git a/LCARStrek/editor/icons/openfile-disabled.gif b/LCARStrek/editor/icons/openfile-disabled.gif
deleted file mode 100755
index dcddfe653989ea8fb28f9a2ad4e6dde983841602..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 141
zcmZ?wbhEHb6k!ly*v!Dt5U}CEfdl{l|7Rc$DE?$&WME)q&;cn2nZdwfWpKiC^<InD
zXAOTO{HT<2V0)Ai_u8{Hs4ML4nM)=Tw}X4%ukXpc;r+5gH-17y@ViNl{Tk^qrR#2Z
IvM^W!0M08YX8-^I

diff --git a/LCARStrek/editor/icons/openfile-hover.gif b/LCARStrek/editor/icons/openfile-hover.gif
deleted file mode 100755
index 27538b07ce6628c788871d4ede05ef99aa74753c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 141
zcmZ?wbhEHb6k!ly*vtR|2M!$g|NlRjNtjUl$->CMz{sEjQVKGIfyK(;gy-tL7O&45
z{z&*yDdoWSC?oE*XKPSb*xNIgOeAgx_r71>lX=7YWrc41goxmGlN|ds(q&55-SA{#
Gum%7R+a~7#

diff --git a/LCARStrek/editor/icons/openfile.gif b/LCARStrek/editor/icons/openfile.gif
deleted file mode 100755
index f4b6e6362daa4eb114b332515f971b2dd59bba72..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 141
zcmZ?wbhEHb6k!ly*v!E2|2)Hi0|);9|Ia`iQ2fcl$iTqJpaW74GJ}D|%HV|O>b(}P
z&l>(n_)#h4!1gF3?zLxYP*>R7GnY&xZU^_iU*D5?!~120Zv2FZ;CGW8`!&*KO4r@+
IWMQxd0QL+hwEzGB

diff --git a/LCARStrek/editor/icons/paste-disabled.gif b/LCARStrek/editor/icons/paste-disabled.gif
deleted file mode 100644
index 8851b0d1721f24dc1a754b8e5e86d996762a1b87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94
zcmZ?wbhEHb6k!lyXkcJy2-xud|9{1wEQ|~cj0`#qKmd|qU^4CLUwL{iLt}8@xi00+
xHzQuvIJ$W)`l0arM(E;OYuaySeJa|&B=6Ad_mvJ2>mqf+r2MA&xHB?X0|4VIBnbcj

diff --git a/LCARStrek/editor/icons/paste-hover.gif b/LCARStrek/editor/icons/paste-hover.gif
deleted file mode 100644
index 8e0d817489dd37b3332e298668350332bc9a6c53..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94
zcmZ?wbhEHb6k!lyXkY+=|Ns9h{$ycfU|?j>0r5dH3{0jy{VPw;WoQfzJlCbX`DVnc
t8b>#;ML!gt-w0iNYfbyjtWQPzm*gFq{l3y6VqK(8n3Uf%A9qFuYXECoB8dP1

diff --git a/LCARStrek/editor/icons/paste.gif b/LCARStrek/editor/icons/paste.gif
deleted file mode 100644
index a121b7b5d9a6763fc3817c0d119e1170dd3f874f..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94
zcmZ?wbhEHb6k!lyXkcLYf1ct0|Nn|VSr{1@7#VaJfB+=Jz+~Ffzw-24hQ{E)b6v`t
xZ$`YTadh)q^h4qKjnKun*0kTu`c$-kN#3E^?<*Z5)<x=sN%>9lac5+(1_1oJBv$|c

diff --git a/LCARStrek/editor/icons/preview-disabled.gif b/LCARStrek/editor/icons/preview-disabled.gif
deleted file mode 100755
index ab4e0648499b80c0f01f4496c421e705661ffa97..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 140
zcmZ?wbhEHb6k!ly*v!Dt5U}CEfddRg1I3>#j0_Bn3_2hkATt<PEDcV0uHI|$`m8xa
z?AO*SD;kxere%GYDJ0XJ@4G$t?LDLJS^7PBOE$CQy4=YNd!swwA+^L!HFEtz4hCxg
D3=|_Y

diff --git a/LCARStrek/editor/icons/preview-hover.gif b/LCARStrek/editor/icons/preview-hover.gif
deleted file mode 100755
index dbcdba93814eb18e003af7270b774c3a5c37c7dd..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 140
zcmZ?wbhEHb6k!ly*vtR|2M!zn(?k)9KUo+V7#JCJK&nAzFtAt}obX(|*W&eAbB5Tj
ztyfkwDn(7p`Y=;Sra9ktd+^(PM%}aYd-9fSX32HAlNa_zcfLbviJNNV`h^?})&Ng6
BA+!Jh

diff --git a/LCARStrek/editor/icons/preview.gif b/LCARStrek/editor/icons/preview.gif
deleted file mode 100755
index e077ed5ab79111b04320b5063fa751d8709a25d7..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 141
zcmZ?wbhEHb6k!ly*v!E2|2)Hi0|yw028usf7#SEC8FWB8KxR0wSQ(t~T+PdHVb1n%
zLG87VOsA%u=vAJzZ+&)AlzY6=-1>s|{||KeWK8@RqAR<4N3g8FS?t@LIeN_z!7L2c
E0B$lQb^rhX

diff --git a/LCARStrek/editor/icons/publish-disabled.gif b/LCARStrek/editor/icons/publish-disabled.gif
deleted file mode 100644
index 8337e93ee4701053ee1a0c1542ce8881f61e56fc..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94
zcmZ?wbhEHb6k-rzSjfQO<kZp-u;D)#DE?$&WB>vk5CM{BVA5~tUwQhi#G*Mu`z9Ey
qWstw$&=yv>$YNTg_{Q9H%NK6;-+nyhKGANq=l8<ABS{+>7_0#vq$IEa

diff --git a/LCARStrek/editor/icons/publish-hover.gif b/LCARStrek/editor/icons/publish-hover.gif
deleted file mode 100644
index a33a217b5d39bfb3d1cd4a932857de8785cafdb3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94
zcmZ?wbhEHb6k-rzSjfQO<kZ5z!0;ao6o0ZX0yzviAOa-Mz@*>Ozw-23iA8gS_DwKY
r%OHQhp)IU%k;Sw~@r}9ZmM`4wzx{a1eWKlJ&+mnKN0K%&FjxZst3@L)

diff --git a/LCARStrek/editor/icons/publish.gif b/LCARStrek/editor/icons/publish.gif
deleted file mode 100755
index 2c4667fe83c9204dce9558edc3e6fde90b7f3c30..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94
zcmZ?wbhEHb6k-rzSjfQO<ka&2Ji~u5Q2fcl$N&U7AOa-Mz@*>Ozw-23iA8gS_DwKY
r%OHQhp)IU%k;Sw~@r}9ZmM`4wzx{a1eWKlJ&+mnKN0K%&FjxZsH%TP^

diff --git a/LCARStrek/editor/icons/savefile-dirty.gif b/LCARStrek/editor/icons/savefile-dirty.gif
deleted file mode 100755
index e64dc6515b537d126b46b4a1aa7f0c2711ef68a3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 157
zcmZ?wbhEHb6k!ly*v!C?mUiaAfdl`6;J^U}B7ovg7DfgJMg|>_T96qGEM5jDJXi0v
zczss)N5YTT0|pFEU0hFJ&eUFg=>5!7I<Z@oRs`!#E_iY4VAY<eH`7dRIqg&uC`<mQ
aW+SG-6%dvlr1SMQi&FL6Emi`I4AubtnK07;

diff --git a/LCARStrek/editor/icons/savefile-disabled.gif b/LCARStrek/editor/icons/savefile-disabled.gif
deleted file mode 100755
index 2ccb1bc12c925d15e263298bdca34fd0dc3c43d8..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 143
zcmZ?wbhEHb6k!ly*v!Dt5U}CEfdl{l|7Rc$DE?$&WME)q&;cn2nZdwfV{pQA^<InD
zXLWxh{D^G`nUzrx^!(N`oj<GQY4(+DO{=bYyf>ymY;kML)|kQ$D<O6N_(>~U{^iYG
KV<y1JU=08~btz#0

diff --git a/LCARStrek/editor/icons/savefile-hover.gif b/LCARStrek/editor/icons/savefile-hover.gif
deleted file mode 100755
index a662daa85a4a78e47e02bd9637d395bffa8c32e5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 143
zcmZ?wbhEHb6k!ly*vtR|2M!$g|NlRjNtjUl$->CMz{sEjQVKGIfyKt)gy-tL7O&6h
z{z&){+YmA<qaf({tz|lYR?XAwE7_V>UG;cxOo7<q)|Ra?g&kHx>i+SQR<``ho4dwL
IfRVu(0DBfE;Q#;t

diff --git a/LCARStrek/editor/icons/savefile.gif b/LCARStrek/editor/icons/savefile.gif
deleted file mode 100755
index 45f7ab7e3f4fc839d47e3077be53851b0bb3117a..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 143
zcmZ?wbhEHb6k!ly*v!E2|2)Hi0|);9|Ia`iQ2fcl$iTqJpaW74GJ}D|#^8kK>b(}P
z&+7h2_z~L>GApAX==rT>I)7Hp)9fqRnpR!)cyCOB*y7fftuciiRzm9j@sn1z{L7oW
K#!P^b!5RQ$@+q$X

diff --git a/LCARStrek/editor/icons/spell-disabled.gif b/LCARStrek/editor/icons/spell-disabled.gif
deleted file mode 100755
index c74f6734db5e453b2b70d6bca6fcdba9648bffe3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 85
zcmZ?wbhEHb6krfwXkcJy2-xud|9{1wEQ|~cj0`#qKmd|qVAAnvShhOh<fGzEiW2%q
nz4Pl-ZW*>tc`{egxGd}BwyRZ<GdQlQ%x#|ccZRP5D}yxvVIv*S

diff --git a/LCARStrek/editor/icons/spell-hover.gif b/LCARStrek/editor/icons/spell-hover.gif
deleted file mode 100755
index 8bab05ab01b50cebf7cfc0bc2f261e1b88e7aa2e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 85
zcmZ?wbhEHb6krfwXkY+=|Ns9h{$ycfU|?j>0r5dH3`{yc4a-(1oP1QgNl`-osCRyy
k$}PjzDNp7q8kc3A+;+7pat6m$mATFH{?71KU}dld0QSTjPXGV_

diff --git a/LCARStrek/editor/icons/spell.gif b/LCARStrek/editor/icons/spell.gif
deleted file mode 100755
index 14119916390d65b6d6bb81888a5fdc9d4d8111d3..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 132
zcmZ?wbhEHb6krfw*v!E2|2)I7W5@mz4HSQ}FfuSOGUzY>0muvn7DEFThoyVPPIUdg
w7Ux!Ymt)fO%0<Dce(~H@ukIw}XC1GQyQeI8@+jw_2G?m`JAT$$2r^g$02WzEY5)KL

diff --git a/LCARStrek/editor/icons/table-disabled.gif b/LCARStrek/editor/icons/table-disabled.gif
deleted file mode 100755
index 376b5a7fc9a2dee870144f971e2923d11761c361..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 134
zcmZ?wbhEHb6k!ly*v!Dt(9p1d|Nj5~|2G6|U?2i0{$ycfU|?j>0jUL<!N6i{aKdx-
zUW?afU;aqY;ES`IxLkALYN-wDxz88Pz4v-WeOdQ$`=|}<UnILd9u{tYZ81N<i-o}&
E09U;xs{jB1

diff --git a/LCARStrek/editor/icons/table-hover.gif b/LCARStrek/editor/icons/table-hover.gif
deleted file mode 100755
index 15ca466803f7efa4bc9d396483e9715cc751a576..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 134
zcmZ?wbhEHb6k!ly*v!Dt(9p1d|Nj5~|1%H=6o0ZXGB7YQ=zx@i%wS+KHaOwAdauRn
zvoC)nXz;~ZPF$|JaJAHi_1x!+=H7d~qQ0#AxP8<H_Aip%9uEt*zqXhk;KjmV4FIuT
BB`W{`

diff --git a/LCARStrek/editor/icons/table.gif b/LCARStrek/editor/icons/table.gif
deleted file mode 100755
index 5ef2b3fcde631615959c26bf0525f2e0d3dd030c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 134
zcmZ?wbhEHb6k!ly*v!C?mUd?U{{8=f;5-8{K=CIFBLf2?gAPbB$P5M+V}lc(tM^*G
zKKt@Vf(Bol<;3Nh3s*~RSkHaFXzsn&E9%R-kK0FWVE-c7?eVa1`)iB&0bVQ&)&PZ=
BClLSu

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 ae41f9a7c0a53683bda1a32a46bb0332a2e9f87c..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 91
zcmZ?wbhEHblw=TPXkcJy2-xud|9{1wEQ|~cj0`#qKmd|qU^43IU(oP&txrwJCX3a{
uiAB7*55AQ?%~+~2bM1wfas@uuzshXiHcx-s(PG_#6%Wsgyy@j)um%8h{3Fc(

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 f43b2fab7cb5cf09103d26a6bd1af02f2df24934..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 91
zcmZ?wbhEHblw=TPXkY+=|Ns9h{$ycfU|?j>0r5dH3`|Bn{R<l2uJx%2*<`UgIkAX0
q_rbT)rx{B%X0E;PQm(+~`d69l+ve$SJ6fz;u;Sr)kvF|u4AuYvtRhVS

diff --git a/LCARStrek/messenger/smime/icons/key-broken.gif b/LCARStrek/messenger/smime/icons/key-broken.gif
deleted file mode 100644
index 5000231be4f1cdb2ce24fa6af84738d61a887650..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 91
zcmZ?wbhEHblw=TPXkcLYf1ct0|Nn|VSr{1@7#VaJfB+=Jz+}|Zzo6mmTA!MbO%|(@
u6N`9rAABo)nz2-4=GqG{<qCYRf0fz3ZJz$Nqs6)fD;}N~dDF|qU=09`p(Gms

diff --git a/LCARStrek/messenger/smime/icons/key-disabled.gif b/LCARStrek/messenger/smime/icons/key-disabled.gif
deleted file mode 100644
index f14334fee3191cb63f9fc3b0c8ad309ebe17f6f4..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94
zcmZ?wbhEHblw=TPXkcJy2-xud|9{1wEQ|~cj0`#qKmd|qU^4CLU(oP&txrwJCX3a{
xiAB7*55AQ?%~+~2bM1wfa=AK(zxd4lxm*3)t{)4VY=zIczESNy?#9Sq4FK;pC1L;o

diff --git a/LCARStrek/messenger/smime/icons/key-hover.gif b/LCARStrek/messenger/smime/icons/key-hover.gif
deleted file mode 100644
index 70554818c4f3d37087e7659de68c0c1a1b1d6e20..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94
zcmZ?wbhEHblw=TPXkY+=|Ns9h{$ycfU|?j>0r5dH3{0jy{R<l2uJx%2*<`UgIkAX0
t_rbT)rx{B%X0E;PQZ85L@E4!iKX<Et+x25%ldbSM*Eg!&$K4nitO0jsBjNx6

diff --git a/LCARStrek/messenger/smime/icons/key.gif b/LCARStrek/messenger/smime/icons/key.gif
deleted file mode 100644
index d798f1777aae8af4af9accba7c75092be377d0fe..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 94
zcmZ?wbhEHblw=TPXkcLYf1ct0|Nn|VSr{1@7#VaJfB+=Jz+~Ffzo6mmTA!MbO%|(@
x6N`9rAABo)nz2-4=GqG{<#KfnfAN|9bGQ1pT|X8!*$SU?eWTia+>MdJ8UP5?C9nVh

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 783eb9c694a5101d9d803748ee9d2eca470e2fa5..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 112
zcmZ?wbhEHblw=TPXkcJy2-xud|9{1wEQ|~cj0`#qKmd|qU~=#2U(oe-yHd4()T^+|
z66gLV&PnWz<Oosn^3zORmah=5YJB~<uk+uyti5TRi}aI&6&uA*@*jzA$~hQ(oO!qF
O%&6dvuWdva7_0##x+pgQ

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 c0d28552eaa3bee918a42db2d516e28afdc0c7bb..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 112
zcmZ?wbhEHblw=TPXkY+=|Ns9h{$ycfU|?j>0r5dH3{37l{R_I@Zda=Ik9rk$S>oK^
z#5sw*ksKjPUVfUX%kmY%RgJGd_jUdom$f&IbCG^>uwtY5N&X|zO*sdHk2CLfof#Fp
L@wJTz1A{dHk=rJ>

diff --git a/LCARStrek/messenger/smime/icons/lock-cert.gif b/LCARStrek/messenger/smime/icons/lock-cert.gif
deleted file mode 100644
index e6a9579a626e3d96e1fc14d949a88ac1e5d30b73..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 112
zcmZ?wbhEHblw=TPXkcLYf1ct0|Nn|VSr{1@7#VaJfB+=Jz~tW3zo6^wcBN|ns8?Z^
zCC>d#oRioa$q}OD<)@jtEMFm9)%f~zU+2GZS$oqs7wIPlD>jOs<UbPKlyflnIP-4T
PnNh(TU)zW<FjxZsL&YeC

diff --git a/LCARStrek/messenger/smime/icons/lock-disabled.gif b/LCARStrek/messenger/smime/icons/lock-disabled.gif
deleted file mode 100644
index 53b8d8c6d3952b0f5afe68f8770cb35703d2b3ef..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 103
zcmZ?wbhEHblw=TPXkcJy2-xud|9{1wEQ|~cj0`#qKmd|qV6yA!U(oe-yHd4()T^+|
z66gLV%5an%o6#cjYN}fGswJ+wBV*TFtesu>e)7>WAz4GFnwt*$8ZK12ge}^jC>qGX
GU=08dJtj{8

diff --git a/LCARStrek/messenger/smime/icons/lock-hover.gif b/LCARStrek/messenger/smime/icons/lock-hover.gif
deleted file mode 100644
index 0758949072fc480f7575069c78f9173e5068bb87..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 103
zcmZ?wbhEHblw=TPXkY+=|Ns9h{$ycfU|?j>0r5dH3`}-C{R_I@Zda=Ik9rk$S>oK^
zL>Z2fV>4PrUQJc2UbVz^cVz5(i?y>0-%mbTCM0XfRCCi|U&Dn;m#{?}6h#9W7_0$_
C-XzZe

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 42e1df0f1a14dce64220c3a9cb67a69d1ffcd2b6..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 127
zcmZ?wbhEHblw=TPSjfQ85U|0)!Qnp`DE?$&WME)o&|v@qkURrZz?A+4U2nH5Rr^Q1
z3cD<E?r-9p#NM0YEdE|I*BslXD8Q{5FqP-`vt16m8EaLYy-aOFb5_kW3KpK{wcSJ4
b(ba67%AGHt-Z1QqpX-vwHvRHKCI)K&ijOfA

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 1dfc51da314c6a2efa4b781374d0b97de2a10130..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 127
zcmZ?wbhEHblw=TPSjYeZ|A7b$6o0ZXGB7YP=zv5)@(fG?Q~DQlz1^-<?H~0j?6SnU
zzln1advA)f_<PM<b8MTU0JmnqRG#0@b~)^3tW|aPGPMcKSvAinSa_b-b`M=gSF?30
WcfNdj!>~7gu1gx*^vesG7_0&PK`+w)

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 9825a23a685f874f1a964c47fac3bf484cfafee1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 127
zcmZ?wbhEHblw=TPSjfQe|2)HgAPEMFKUo+V7?>Dz7=QpI&%hKgrGG)!+wDr#{!y>O
zE=!#In>Z)2_og_Dzt_w)$F?a7aBBuk<@x<=m&0zxT2*H+Q=8D7Rr8F3h39!~_t158
aHCv~0=gX%z4143}x}>p9zr2u%!5RR{Ju#sG

diff --git a/LCARStrek/messenger/smime/icons/lock.gif b/LCARStrek/messenger/smime/icons/lock.gif
deleted file mode 100644
index 58ff2f2e8195a6843c970eea2e5e6b1489d65d79..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 103
zcmZ?wbhEHblw=TPXkcLYf1ct0|Nn|VSr{1@7#VaJfB+=Jz+~6czo6^wcBN|ns8?Z^
zCC>d#l;J2jHls!4)l{|WRZCoVN5-zVSUbD${p6!%Lb8TTH8&mhHC(8430t&5Q8bW&
G!5RQ7iYA=^

diff --git a/LCARStrek/messenger/smime/icons/smimeicons-small.png b/LCARStrek/messenger/smime/icons/smimeicons-small.png
new file mode 100644
index 0000000000000000000000000000000000000000..06ceab8ac56d754aaa577b5918183c7d0f10be1a
GIT binary patch
literal 547
zcmeAS@N?(olHy`uVBq!ia0vp^20$FZ!VDzW-gx~ENHG=%xjQkeJ16rJ$Po(g32_C|
zK=7Y|!NI|yAz;J*^9*Zbw`~LpF_r}R1v5B2yO9RsBze2LFm$lWdH^|`1s;*b3=G`D
zAk4@xYmNj^kiEpy*OmPy7b~}wyh6S4PN0xviEBiObAE1aYF-J0b5UwyNotBhd1gt5
zg1e`0KzJjcIMCn-PZ!4!i_=#p8|JYn^0@Lc+umu=-M0J&b3j2uX3hWANB%$dTs2eU
zQr;#<k83YJ=KeX`;Snaf#zZ}N#nix%QujH<d`F_P9nW;}GMcg6U?`h&pilV5M|I}i
zI%0a=t*4V>8NV$!(-PBY8`E^(qm*r)b-$0VROhUKLzg5Bd=e%eSj1dvAREFSS=OY|
ztl**fhM9qtA>e_qf+#}}qrue5qmQ16cFzu9ZQ*cjuEJSIfmai~Y^GMMa&BZ>=+GRn
z;b6T*zuF~+T^{TY%pI<H95pl7O6s-izjn>0D*kiE+2?|_a<k7X%c<SFZS?Wt^v><u
ze0qd3AE`<EZh6o8ZkKt(aT(bMVcx%ASDq-k`>98C`s-y64;$V8x#3K?ole6W1xt>H
z(ya5Wu78j^n!UpzMj@W*H@C)y{S8eDPj~$|e?4>6=SQ!$&#k*%^`uCF?+L^6uFdD}
h7t6ipjI-<KpJUQwx842SO<+VYc)I$ztaD0e0sv*O({um;

literal 0
HcmV?d00001

diff --git a/LCARStrek/messenger/smime/icons/smimeicons.png b/LCARStrek/messenger/smime/icons/smimeicons.png
new file mode 100644
index 0000000000000000000000000000000000000000..b533cc8149a09af9840dda892fdce9862cfcdbc0
GIT binary patch
literal 619
zcmV-x0+juUP)<h;3K|Lk000e1NJLTq002t>003zO0{{R3fCR(j00001b5ch_0Itp)
z=>Px#5>QN3MK@@K{{R30004kcu>a2hKtMnlGE6-H0004WQchC<K<3zH00001VoOIv
z0Eh)0NB{r;32;bRa{vGf6951U69E94oEQKA00(qQO+^RU3Jek`GIOiQY5)KM#Ysd#
zR7l6|l}nC;FbsxGNcW`b0WvuOQpBE-asW2m|0)wFesu?xDs|dMgopU#-}z$$0FF{t
z;4$Vb_mEQ5hf<WQlyWH<&LdXn0jWIqdxuz3tj~_keRix*(p>q3ntVdd$fp;_3XPRr
zW9Jf$_za9pZWtNcF*5la_Bpv7!``H2Jj)^>vXyWuix_G%hKOLOZLqQ`R!@qhXfTfl
zV>2FvIXq++2y3n}*6er)que@1xpi|nw?eD*TyH!Rt@0e!a>Mjkw57+nVS1VyMdKaN
z-0nmPZK8}OE|PD{yj07CdKspUUAB7N36mEM8>X@bj<%1vp@<Dria|vK3^&G>4R#T&
zFRr=^!xXfT_RA)PRA1P#3^&D=-IQgx+OiCjVwc^NWtdD^vS_PZ7Db0u6fs&t!*~e|
zyIaEVt(3r`d(O*7qCeM^f?(_-Vhh`gnA-a;Ed!=yX4^7)U$ghxSsApmTy(ax{3_wb
zIgb)9xoE=GU|ukw&p3`6%o&V+3LOK3$xnd{Hlkoe#p4r8IA{o%U|@pDellhsW{bfS
zhs|xYFXAIhID~og=>_}gb?LugM-BP5%yV1jQ?QR{nLm8K=giA)dZz#Y002ovPDHLk
FV1lm@08an_

literal 0
HcmV?d00001

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;
-- 
2.35.3