X-Git-Url: https://git-public.kairo.at/?p=themes.git;a=blobdiff_plain;f=LCARStrek%2Fmessenger%2FprimaryToolbar.css;h=c85c4157525acfb94332ce8f2a2b16a3bbc3985b;hp=4f7738ee14d363b251b4d7663cd5a94833d29ef8;hb=4bbe25041faed817edb46f7814a6cc95c4e3f820;hpb=c09bd2ddc32d2bd0de40b939b6641684c4f0b97b

diff --git a/LCARStrek/messenger/primaryToolbar.css b/LCARStrek/messenger/primaryToolbar.css
index 4f7738ee..c85c4157 100644
--- a/LCARStrek/messenger/primaryToolbar.css
+++ b/LCARStrek/messenger/primaryToolbar.css
@@ -1,39 +1,6 @@
-/* ***** BEGIN LICENSE BLOCK *****
- * Version: NPL 1.1/GPL 2.0/LGPL 2.1
- *
- * The contents of this file are subject to the Netscape Public License
- * Version 1.1 (the "License"); you may not use this file except in
- * compliance with the License. You may obtain a copy of the License at
- * http://www.mozilla.org/NPL/
- *
- * Software distributed under the License is distributed on an "AS IS" basis,
- * WITHOUT WARRANTY OF ANY KIND, either express or implied. See the License
- * for the specific language governing rights and limitations under the
- * License.
- *
- * The Original Code is mozilla.org code.
- *
- * The Initial Developer of the Original Code is
- * Netscape Communications Corporation.
- * Portions created by the Initial Developer are Copyright (C) 1998
- * the Initial Developer. All Rights Reserved.
- *
- * Contributor(s):
- *   Robert Kaiser <KaiRo@KaiRo.at>
- *
- * Alternatively, the contents of this file may be used under the terms of
- * either the GNU General Public License Version 2 or later (the "GPL"), or
- * the GNU Lesser General Public License Version 2.1 or later (the "LGPL"),
- * in which case the provisions of the GPL or the LGPL are applicable instead
- * of those above. If you wish to allow use of your version of this file only
- * under the terms of either the GPL or the LGPL, and not to allow others to
- * use your version of this file under the terms of the NPL, indicate your
- * decision by deleting the provisions above and replace them with the notice
- * and other provisions required by the GPL or the LGPL. If you do not delete
- * the provisions above, a recipient may use your version of this file under
- * the terms of any one of the NPL, the GPL or the LGPL.
- *
- * ***** END LICENSE BLOCK ***** */
+/* This Source Code Form is subject to the terms of the Mozilla Public
+ * License, v. 2.0. If a copy of the MPL was not distributed with this
+ * file, You can obtain one at http://mozilla.org/MPL/2.0/. */
 
 /* ===== primaryToolbar.css =============================================
   == Images for the Mail primary toolbar.
@@ -44,89 +11,92 @@
 /* ::::: primary toolbar buttons ::::: */
 
 #button-getmsg {
-  /* list-style-image: url("chrome://messenger/skin/icons/messengericons.png"); */
-  list-style-image: url("chrome://messenger/skin/toolbar/getmsg.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(63px 25px 84px 0px);
 }
 
-#button-getmsg:hover,
-#button-getmsg:hover:active,
-#button-getmsg[open="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/getmsg-hover.gif");
+#button-getmsg[disabled="true"] {
+  -moz-image-region: rect(63px 50px 84px 25px);
 }
 
-#button-getmsg[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/getmsg-disabled.gif") !important;
+#button-getmsg:not([disabled="true"]):hover,
+#button-getmsg:not([disabled="true"]):hover:active,
+#button-getmsg[open="true"] {
+  -moz-image-region: rect(63px 75px 84px 50px);
 }
 
 #button-newmsg {
-  /* list-style-image: url("chrome://messenger/skin/icons/messengericons.png"); */
-  list-style-image: url("chrome://messenger/skin/toolbar/newmsg.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(105px 25px 126px 0px);
 }
 
-#button-newmsg:hover,
-#button-newmsg:hover:active {
-  list-style-image: url("chrome://messenger/skin/toolbar/newmsg-hover.gif");
+#button-newmsg[disabled="true"] {
+  -moz-image-region: rect(105px 50px 126px 25px);
 }
 
-#button-newmsg[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/newmsg-disabled.gif") !important;
+#button-newmsg:not([disabled="true"]):hover,
+#button-newmsg:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(105px 75px 126px 50px);
 }
 
 #button-reply {
-  /* list-style-image: url("chrome://messenger/skin/icons/messengericons.png"); */
-  list-style-image: url("chrome://messenger/skin/toolbar/reply.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(147px 25px 168px 0px);
 }
 
-#button-reply:hover,
-#button-reply:hover:active {
-  list-style-image: url("chrome://messenger/skin/toolbar/reply-hover.gif");
+#button-reply[disabled="true"] {
+  -moz-image-region: rect(147px 50px 168px 25px);
 }
 
-#button-reply[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/reply-disabled.gif") !important;
+#button-reply:not([disabled="true"]):hover,
+#button-reply:not([disabled="true"]):hover:active,
+#button-reply[open="true"] {
+  -moz-image-region: rect(147px 75px 168px 50px);
 }
 
 #button-replyall {
-  /* list-style-image: url("chrome://messenger/skin/icons/messengericons.png"); */
-  list-style-image: url("chrome://messenger/skin/toolbar/replyall.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(168px 25px 189px 0px);
 }
 
-#button-replyall:hover,
-#button-replyall:hover:active {
-  list-style-image: url("chrome://messenger/skin/toolbar/replyall-hover.gif");
+#button-replyall[disabled="true"] {
+  -moz-image-region: rect(168px 50px 189px 25px);
 }
 
-#button-replyall[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/replyall-disabled.gif") !important;
+#button-replyall:not([disabled="true"]):hover,
+#button-replyall:not([disabled="true"]):hover:active,
+#button-replyall[open="true"] {
+  -moz-image-region: rect(168px 75px 189px 50px);
 }
 
 #button-forward {
-  /* list-style-image: url("chrome://messenger/skin/icons/messengericons.png"); */
-  list-style-image: url("chrome://messenger/skin/toolbar/forward.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(42px 25px 63px 0px);
 }
 
-#button-forward:hover,
-#button-forward:hover:active {
-  list-style-image: url("chrome://messenger/skin/toolbar/forward-hover.gif");
+#button-forward[disabled="true"] {
+  -moz-image-region: rect(42px 50px 63px 25px);
 }
 
-#button-forward[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/forward-disabled.gif") !important;
+#button-forward:not([disabled="true"]):hover,
+#button-forward:not([disabled="true"]):hover:active,
+#button-forward[open="true"] {
+  -moz-image-region: rect(42px 75px 63px 50px);
 }
 
 #button-file {
-  /* list-style-image: url("chrome://messenger/skin/icons/messengericons.png"); */
-  list-style-image: url("chrome://messenger/skin/toolbar/file.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(21px 25px 42px 0px);
 }
 
-#button-file:hover,
-#button-file:hover:active,
-#button-file[open="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/file-hover.gif");
+#button-file[disabled="true"] {
+  -moz-image-region: rect(21px 50px 42px 25px);
 }
 
-#button-file[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/file-disabled.gif") !important;
+#button-file:not([disabled="true"]):hover,
+#button-file:not([disabled="true"]):hover:active,
+#button-file[open="true"] {
+  -moz-image-region: rect(21px 75px 42px 50px);
 }
 
 #button-goback {
@@ -134,14 +104,14 @@
   -moz-image-region: rect(42px 25px 63px 0px);
 }
 
-#button-goback:hover,
-#button-goback:hover:active,
+#button-goback:not([disabled="true"]):hover,
+#button-goback:not([disabled="true"]):hover:active,
 #button-goback[open="true"] {
   -moz-image-region: rect(42px 75px 63px 50px);
 }
 
 #button-goback[disabled="true"] {
-  -moz-image-region: rect(42px 50px 63px 25px) !important;
+  -moz-image-region: rect(42px 50px 63px 25px);
 }
 
 #button-goforward {
@@ -149,72 +119,62 @@
   -moz-image-region: rect(63px 25px 84px 0px);
 }
 
-#button-goforward:hover,
-#button-goforward:hover:active,
+#button-goforward:not([disabled="true"]):hover,
+#button-goforward:not([disabled="true"]):hover:active,
 #button-goforward[open="true"] {
   -moz-image-region: rect(63px 75px 84px 50px);
 }
 
 #button-goforward[disabled="true"] {
-  -moz-image-region: rect(63px 50px 84px 25px) !important;
+  -moz-image-region: rect(63px 50px 84px 25px);
 }
 
 #button-next {
-  /* list-style-image: url("chrome://messenger/skin/icons/messengericons.png"); */
-  list-style-image: url("chrome://messenger/skin/toolbar/next.gif");
-}
-
-#button-next:hover,
-#button-next:hover:active {
-  list-style-image: url("chrome://messenger/skin/toolbar/next-hover.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(126px 25px 147px 0px);
 }
 
 #button-next[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/next-disabled.gif") !important;
+  -moz-image-region: rect(126px 50px 147px 25px);
 }
 
-#button-delete {
-  /* list-style-image: url("chrome://messenger/skin/icons/messengericons.png"); */
-  list-style-image: url("chrome://global/skin/icons/trash.gif");
+#button-next:not([disabled="true"]):hover,
+#button-next:not([disabled="true"]):hover:active,
+#button-next[open="true"] {
+  -moz-image-region: rect(126px 75px 147px 50px);
 }
 
-#button-delete:hover,
-#button-delete:hover:active {
-  list-style-image: url("chrome://global/skin/icons/trash-hover.gif");
+#button-delete {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(0px 25px 21px 0px);
 }
 
 #button-delete[disabled="true"] {
-  list-style-image: url("chrome://global/skin/icons/trash-disabled.gif") !important;
+  -moz-image-region: rect(0px 50px 21px 25px);
 }
 
-#button-mark {
-  /* list-style-image: url("chrome://messenger/skin/icons/messengericons.png"); */
-  list-style-image: url("chrome://messenger/skin/toolbar/mark.gif");
+#button-delete:not([disabled="true"]):hover,
+#button-delete:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(0px 75px 21px 50px);
 }
 
-#button-mark:hover,
-#button-mark:hover:active,
-#button-mark[open="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/mark-hover.gif");
+toolbarpaletteitem > #button-delete {
+  display: -moz-box;
 }
 
-#button-mark[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/mark-disabled.gif") !important;
-}
-
-#button-print {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-  -moz-image-region: rect(0px 25px 21px 0px);
+#button-mark {
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(84px 25px 105px 0px);
 }
 
-#button-print:hover,
-#button-print:hover:active,
-#button-print[open="true"] {
-  -moz-image-region: rect(0px 75px 21px 50px);
+#button-mark[disabled="true"] {
+  -moz-image-region: rect(84px 50px 105px 25px);
 }
 
-#button-print[disabled="true"] {
-  -moz-image-region: rect(0px 50px 21px 25px) !important;
+#button-mark:not([disabled="true"]):hover,
+#button-mark:not([disabled="true"]):hover:active,
+#button-mark[open="true"] {
+  -moz-image-region: rect(84px 75px 105px 50px);
 }
 
 #button-stop {
@@ -222,53 +182,84 @@
   -moz-image-region: rect(21px 25px 42px 0px);
 }
 
-#button-stop:hover,
-#button-stop:hover:active {
+#button-stop:not([disabled="true"]):hover,
+#button-stop:not([disabled="true"]):hover:active {
   -moz-image-region: rect(21px 75px 42px 50px);
 }
 
 #button-stop[disabled="true"] {
-  -moz-image-region: rect(21px 50px 42px 25px) !important;
+  -moz-image-region: rect(21px 50px 42px 25px);
 }
 
 #button-junk {
-  /* list-style-image: url("chrome://messenger/skin/icons/messengericons.png"); */
-  list-style-image: url("chrome://messenger/skin/toolbar/junk.gif");
+  list-style-image: url("chrome://messenger/skin/icons/messengericons.png");
+  -moz-image-region: rect(252px 25px 273px 0px);
 }
 
-#button-junk:hover,
-#button-junk:hover:active,
-#button-junk[open="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/junk-hover.gif");
+#button-junk[disabled="true"] {
+  -moz-image-region: rect(252px 50px 273px 25px);
 }
 
-#button-junk[disabled="true"] {
-  list-style-image: url("chrome://messenger/skin/toolbar/junk-disabled.gif") !important;
+#button-junk:not([disabled="true"]):hover,
+#button-junk:not([disabled="true"]):hover:active {
+  -moz-image-region: rect(252px 75px 273px 50px);
+}
+
+#sync-button {
+  list-style-image: url("chrome://communicator/skin/sync/sync-32.png");
+}
+
+#sync-button[status=active] {
+  list-style-image: url("chrome://communicator/skin/sync/sync-32-throbber.png");
+}
+
+#locationFolders {
+  width: 22em;
+}
+
+toolbarpaletteitem[place="palette"] > #folder-location-container > #locationFolders {
+  max-width: 11em;
+}
+
+toolbarpaletteitem[place="palette"] > #search-container > #searchInput {
+  max-width: 11em;
+}
+
+toolbarpaletteitem[place="palette"] > #mailviews-container > #viewPicker {
+  max-width: 11em;
+}
+
+#viewPickerPopup > menuitem > .menu-iconic-left,
+#viewPickerPopup > menu > menupopup > menuitem > .menu-iconic-left {
+  display: -moz-box !important;
 }
 
 /* ::::: small primary toolbar buttons ::::: */
-/*
-toolbar[iconsize="small"] > #button-getmsg {
+
+toolbar[iconsize="small"] > #button-getmsg,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-getmsg {
   list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
   -moz-image-region: rect(48px 16px 64px 0);
 }
 
 toolbar[iconsize="small"] > #button-getmsg[disabled="true"] {
-  -moz-image-region: rect(48px 32px 64px 16px) !important;
+  -moz-image-region: rect(48px 32px 64px 16px);
 }
 
 toolbar[iconsize="small"] > #button-getmsg:not([disabled="true"]):hover,
-toolbar[iconsize="small"] > #button-getmsg:not([disabled="true"]):hover:active {
+toolbar[iconsize="small"] > #button-getmsg:not([disabled="true"]):hover:active,
+toolbar[iconsize="small"] > #button-getmsg[open="true"] {
   -moz-image-region: rect(48px 48px 64px 32px);
 }
 
-toolbar[iconsize="small"] > #button-newmsg {
+toolbar[iconsize="small"] > #button-newmsg,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-newmsg {
   list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
   -moz-image-region: rect(80px 16px 96px 0);
 }
 
 toolbar[iconsize="small"] > #button-newmsg[disabled="true"] {
-  -moz-image-region: rect(80px 32px 96px 16px) !important;
+  -moz-image-region: rect(80px 32px 96px 16px);
 }
 
 toolbar[iconsize="small"] > #button-newmsg:not([disabled="true"]):hover,
@@ -276,111 +267,126 @@ toolbar[iconsize="small"] > #button-newmsg:not([disabled="true"]):hover:active {
   -moz-image-region: rect(80px 48px 96px 32px);
 }
 
-toolbar[iconsize="small"] > #button-reply {
+toolbar[iconsize="small"] > #button-reply,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-reply {
   list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
   -moz-image-region: rect(112px 16px 128px 0);
 }
 
 toolbar[iconsize="small"] > #button-reply[disabled="true"] {
-  -moz-image-region: rect(112px 32px 128px 16px) !important;
+  -moz-image-region: rect(112px 32px 128px 16px);
 }
 
 toolbar[iconsize="small"] > #button-reply:not([disabled="true"]):hover,
-toolbar[iconsize="small"] > #button-reply:not([disabled="true"]):hover:active {
+toolbar[iconsize="small"] > #button-reply:not([disabled="true"]):hover:active,
+toolbar[iconsize="small"] > #button-reply[open="true"] {
   -moz-image-region: rect(112px 48px 128px 32px);
 }
 
-toolbar[iconsize="small"] > #button-replyall {
+toolbar[iconsize="small"] > #button-replyall,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-replyall {
   list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
   -moz-image-region: rect(128px 16px 144px 0);
 }
 
 toolbar[iconsize="small"] > #button-replyall[disabled="true"] {
-  -moz-image-region: rect(128px 32px 144px 16px) !important;
+  -moz-image-region: rect(128px 32px 144px 16px);
 }
 
 toolbar[iconsize="small"] > #button-replyall:not([disabled="true"]):hover,
-toolbar[iconsize="small"] > #button-replyall:not([disabled="true"]):hover:active {
+toolbar[iconsize="small"] > #button-replyall:not([disabled="true"]):hover:active,
+toolbar[iconsize="small"] > #button-replyall[open="true"] {
   -moz-image-region: rect(128px 48px 144px 32px);
 }
 
-toolbar[iconsize="small"] > #button-forward {
+toolbar[iconsize="small"] > #button-forward,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-forward {
   list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
   -moz-image-region: rect(32px 16px 48px 0);
 }
 
 toolbar[iconsize="small"] > #button-forward[disabled="true"] {
-  -moz-image-region: rect(32px 32px 48px 16px) !important;
+  -moz-image-region: rect(32px 32px 48px 16px);
 }
 
 toolbar[iconsize="small"] > #button-forward:not([disabled="true"]):hover,
-toolbar[iconsize="small"] > #button-forward:not([disabled="true"]):hover:active {
+toolbar[iconsize="small"] > #button-forward:not([disabled="true"]):hover:active,
+toolbar[iconsize="small"] > #button-forward[open="true"] {
   -moz-image-region: rect(32px 48px 48px 32px);
 }
 
-toolbar[iconsize="small"] > #button-file {
+toolbar[iconsize="small"] > #button-file,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-file {
   list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
   -moz-image-region: rect(16px 16px 32px 0);
 }
 
 toolbar[iconsize="small"] > #button-file[disabled="true"] {
-  -moz-image-region: rect(16px 32px 32px 16px) !important;
+  -moz-image-region: rect(16px 32px 32px 16px);
 }
 
 toolbar[iconsize="small"] > #button-file:not([disabled="true"]):hover,
-toolbar[iconsize="small"] > #button-file:not([disabled="true"]):hover:active {
+toolbar[iconsize="small"] > #button-file:not([disabled="true"]):hover:active,
+toolbar[iconsize="small"] > #button-file[open="true"] {
   -moz-image-region: rect(16px 48px 32px 32px);
 }
-*/
-toolbar[iconsize="small"] > #button-goback {
+
+toolbar[iconsize="small"] > #button-goback,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-goback {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
   -moz-image-region: rect(32px 16px 48px 0);
 }
 
 toolbar[iconsize="small"] > #button-goback[disabled="true"] {
-  -moz-image-region: rect(32px 32px 48px 16px) !important;
+  -moz-image-region: rect(32px 32px 48px 16px);
 }
 
 toolbar[iconsize="small"] > #button-goback:not([disabled="true"]):hover,
-toolbar[iconsize="small"] > #button-goback:not([disabled="true"]):hover:active {
+toolbar[iconsize="small"] > #button-goback:not([disabled="true"]):hover:active,
+toolbar[iconsize="small"] > #button-goback[open="true"] {
   -moz-image-region: rect(32px 48px 48px 32px);
 }
 
-toolbar[iconsize="small"] > #button-goforward {
+toolbar[iconsize="small"] > #button-goforward,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-goforward {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
   -moz-image-region: rect(48px 16px 64px 0);
 }
 
 toolbar[iconsize="small"] > #button-goforward[disabled="true"] {
-  -moz-image-region: rect(48px 32px 64px 16px) !important;
+  -moz-image-region: rect(48px 32px 64px 16px);
 }
 
 toolbar[iconsize="small"] > #button-goforward:not([disabled="true"]):hover,
-toolbar[iconsize="small"] > #button-goforward:not([disabled="true"]):hover:active {
+toolbar[iconsize="small"] > #button-goforward:not([disabled="true"]):hover:active,
+toolbar[iconsize="small"] > #button-goforward[open="true"] {
   -moz-image-region: rect(48px 48px 64px 32px);
 }
-/*
-toolbar[iconsize="small"] > #button-next {
+
+toolbar[iconsize="small"] > #button-next,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-next {
   list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
   -moz-image-region: rect(96px 16px 112px 0);
 }
 
 toolbar[iconsize="small"] > #button-next[disabled="true"] {
-  -moz-image-region: rect(96px 32px 112px 16px) !important;
+  -moz-image-region: rect(96px 32px 112px 16px);
 }
 
 toolbar[iconsize="small"] > #button-next:not([disabled="true"]):hover,
-toolbar[iconsize="small"] > #button-next:not([disabled="true"]):hover:active {
+toolbar[iconsize="small"] > #button-next:not([disabled="true"]):hover:active,
+toolbar[iconsize="small"] > #button-next[open="true"] {
   -moz-image-region: rect(96px 48px 112px 32px);
 }
 
-toolbar[iconsize="small"] > #button-delete {
+toolbar[iconsize="small"] > #button-delete,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-delete {
   list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
   -moz-image-region: rect(0 16px 16px 0);
 }
 
 toolbar[iconsize="small"] > #button-delete[disabled="true"] {
-  -moz-image-region: rect(0 32px 16px 16px) !important;
+  -moz-image-region: rect(0 32px 16px 16px);
 }
 
 toolbar[iconsize="small"] > #button-delete:not([disabled="true"]):hover,
@@ -388,55 +394,45 @@ toolbar[iconsize="small"] > #button-delete:not([disabled="true"]):hover:active {
   -moz-image-region: rect(0 48px 16px 32px);
 }
 
-toolbar[iconsize="small"] > #button-mark {
+toolbar[iconsize="small"] > #button-mark,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-mark {
   list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
   -moz-image-region: rect(64px 16px 80px 0);
 }
 
 toolbar[iconsize="small"] > #button-mark[disabled="true"] {
-  -moz-image-region: rect(64px 32px 80px 16px) !important;
+  -moz-image-region: rect(64px 32px 80px 16px);
 }
 
 toolbar[iconsize="small"] > #button-mark:not([disabled="true"]):hover,
-toolbar[iconsize="small"] > #button-mark:not([disabled="true"]):hover:active {
+toolbar[iconsize="small"] > #button-mark:not([disabled="true"]):hover:active,
+toolbar[iconsize="small"] > #button-mark[open="true"] {
   -moz-image-region: rect(64px 48px 80px 32px);
 }
 
-toolbar[iconsize="small"] > #button-junk > .toolbarbutton-1 {
+toolbar[iconsize="small"] > #button-junk,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-junk {
   list-style-image: url("chrome://messenger/skin/icons/messengericons-small.png");
   -moz-image-region: rect(192px 16px 208px 0);
 }
 
-toolbar[iconsize="small"] > #button-replyall[disabled="true"] {
-  -moz-image-region: rect(192px 32px 208px 16px) !important;
+toolbar[iconsize="small"] > #button-junk[disabled="true"] {
+  -moz-image-region: rect(192px 32px 208px 16px);
 }
 
-toolbar[iconsize="small"] > #button-replyall:not([disabled="true"]):hover,
-toolbar[iconsize="small"] > #button-replyall:not([disabled="true"]):hover:active {
+toolbar[iconsize="small"] > #button-junk:not([disabled="true"]):hover
+toolbar[iconsize="small"] > #button-junk:not([disabled="true"]):hover:active {
   -moz-image-region: rect(192px 48px 208px 32px);
 }
-*/
-toolbar[iconsize="small"] > #button-print {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
-  -moz-image-region: rect(0 16px 16px 0);
-}
 
-toolbar[iconsize="small"] > #button-print[disabled="true"] {
-  -moz-image-region: rect(0 32px 16px 16px) !important;
-}
-
-toolbar[iconsize="small"] > #button-print:not([disabled="true"]):hover,
-toolbar[iconsize="small"] > #button-print:not([disabled="true"]):hover:active {
-  -moz-image-region: rect(0 48px 16px 32px);
-}
-
-toolbar[iconsize="small"] > #button-stop {
+toolbar[iconsize="small"] > #button-stop,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-stop {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
   -moz-image-region: rect(16px 16px 32px 0);
 }
 
 toolbar[iconsize="small"] > #button-stop[disabled="true"] {
-  -moz-image-region: rect(16px 32px 32px 16px) !important;
+  -moz-image-region: rect(16px 32px 32px 16px);
 }
 
 toolbar[iconsize="small"] > #button-stop:not([disabled="true"]):hover,
@@ -444,34 +440,72 @@ toolbar[iconsize="small"] > #button-stop:not([disabled="true"]):hover:active {
   -moz-image-region: rect(16px 48px 32px 32px);
 }
 
+toolbar[iconsize="small"] > toolbarpaletteitem > #sync-button,
+toolbar[iconsize="small"] > #sync-button {
+  list-style-image: url("chrome://communicator/skin/sync/sync-16.png");
+}
+
+toolbar[iconsize="small"] > toolbarpaletteitem > #sync-button[status=active],
+toolbar[iconsize="small"] > #sync-button[status=active] {
+  list-style-image: url("chrome://communicator/skin/sync/sync-16-throbber.png");
+}
+
+/* ::::: Lightning icon sizes ::::: */
+
+#lightning-button-calendar > .toolbarbutton-icon,
+#lightning-button-tasks > .toolbarbutton-icon,
+#extractEventButton > .toolbarbutton-icon,
+#extractTaskButton > .toolbarbutton-icon,
+#extractEventButton > .box-inherit > .toolbarbutton-icon,
+#extractTaskButton > .box-inherit > .toolbarbutton-icon {
+  width: 29px;
+  height: 29px;
+}
+
+toolbar[iconsize="small"] > #lightning-button-calendar > .toolbarbutton-icon,
+toolbar[iconsize="small"] > #lightning-button-tasks > .toolbarbutton-icon,
+toolbar[iconsize="small"] > #extractEventButton > .box-inherit > .toolbarbutton-icon,
+toolbar[iconsize="small"] > #extractTaskButton > .box-inherit > .toolbarbutton-icon {
+  width: 19px;
+  height: 19px;
+}
+
+#lightning-button-calendar[disabled="true"] > .toolbarbutton-icon,
+#lightning-button-tasks[disabled="true"] > .toolbarbutton-icon,
+#extractEventButton[disabled="true"] > .box-inherit > .toolbarbutton-icon,
+#extractTaskButton[disabled="true"] > .box-inherit > .toolbarbutton-icon {
+  opacity: 0.3;
+}
+
 /* ::::: message notification bar style rules ::::: */
 
+#msgNotificationBar:not([collapsed="true"]) > .msgNotificationBar {
+  margin-bottom: 3px;
+}
+
 .msgNotificationBar {
-  -moz-border-radius: 7px;
+  border-radius: 7px;
   padding: 3px;
-  margin-bottom: 3px;
   background-color: #FF9F00;
   color: #000000;
 }
 
-.msgNotificationBarText {
-  font-weight: bold;
+.msgNotificationBar:-moz-lwtheme {
+  text-shadow: none;
 }
 
-#junkBarImage {
-  list-style-image: url("chrome://messenger/skin/toolbar/junk-hover.gif");
+.messageImage[value="remoteContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/remote-blocked.png");
 }
 
-#junkIcon {
-  margin-left: 0.5ex;
-  list-style-image: url("chrome://messenger/skin/icons/folder-junk.gif");
+.messageImage[value="junkContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/junk.png");
 }
 
-#remoteContentImage {
-  list-style-image: url("chrome://messenger/skin/toolbar/remote-blocked.png");
-  padding: 3px;
+.messageImage[value="phishingContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/phishing.png");
 }
 
-#allowRemoteContentForAuthorDesc {
-  padding-left: 10px;
+.messageImage[value="mdnContent"] {
+  list-style-image: url("chrome://messenger/skin/icons/info.png");
 }