From: Robert Kaiser <robert@notebook.(none)>
Date: Mon, 28 Sep 2009 17:26:20 +0000 (+0200)
Subject: updates to both themes for 1.9.1 toolkit winstripe changes, suite classic changes... 
X-Git-Tag: EarlyBlue-2.1a1~29
X-Git-Url: https://git-public.kairo.at/?a=commitdiff_plain;h=8b17a53f795d5dac9741cb28dc374ddb927488ae;p=themes.git

updates to both themes for 1.9.1 toolkit winstripe changes, suite classic changes up to msgcompose toolbar customize, 2009-09-21
---

diff --git a/EarlyBlue/communicator/communicator.css b/EarlyBlue/communicator/communicator.css
index bc85a14f..96548741 100644
--- a/EarlyBlue/communicator/communicator.css
+++ b/EarlyBlue/communicator/communicator.css
@@ -98,6 +98,13 @@
   margin: 0px !important;
 }
 
+/* ::::: iconic menu and menuitems ::::: */
+
+menu.menu-iconic > .menu-iconic-left,
+menuitem.menuitem-iconic > .menu-iconic-left {
+  display: -moz-box;
+}
+
 /* ::::: download manager ::::: */
 
 #downloadView > treechildren::-moz-tree-image(Name) {
diff --git a/EarlyBlue/communicator/preferences.css b/EarlyBlue/communicator/preferences.css
index 1c33deb6..cd4c8f02 100644
--- a/EarlyBlue/communicator/preferences.css
+++ b/EarlyBlue/communicator/preferences.css
@@ -46,38 +46,3 @@ prefwindow {
   -moz-padding-start: 8px;
   -moz-padding-end: 10px;
 }
-
-/* File Field Widget */
-filefield {
-  margin: 2px 4px;
-  border: 1px inset #CCD0DD;
-}
-
-.fileFieldContentBox {
-  background-color: #CCD0DD;
-}
-
-filefield[disabled="true"] {
-  color: #CCCCCC;
-  border: 1px solid #666699;
-}
-
-.fileFieldIcon[disabled="true"] {
-  opacity: 0.4;
-}
-
-.fileFieldIcon {
-  width: 16px;
-  height: 16px;
-  margin-top: 1px;
-  margin-bottom: 1px;
-  -moz-margin-start: 1px;
-  -moz-margin-end: 4px;
-}
-
-.fileFieldLabel {
-  -moz-appearance: none;
-  background-color: transparent;
-  border: none;
-  margin: 0px;
-}
diff --git a/EarlyBlue/editor/EditorDialog.css b/EarlyBlue/editor/EditorDialog.css
index 9b8dfda3..78ab644d 100644
--- a/EarlyBlue/editor/EditorDialog.css
+++ b/EarlyBlue/editor/EditorDialog.css
@@ -38,13 +38,6 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/* The defaults are WAY to big! */
-groupbox {
-  margin: 2px 5px /* 4px 5px */;
-  padding-top: 2px;
-  padding-bottom: 4px;
-}
-
 .MinWidth5em {
   min-width: 5em;
 }
@@ -85,14 +78,6 @@ groupbox {
   font-weight: bold;
 }
 
-/* Use this with groove-thin in dialogs 
-   to add margins to top and bottom
-*/
-.tb-margin {
-  margin-top: 6px;
-  margin-bottom: 6px;
-}
-
 .color-well {
   width: 20px;
   height: 12px; 
@@ -110,10 +95,6 @@ groupbox {
   margin: 2px;
 }
 
-.menu-list[focused="true"] {
-  color: white;
-}
-
 #ColorPicker {
   -moz-user-focus: normal;
 }
@@ -141,14 +122,6 @@ groupbox {
   -moz-margin-end: 2px;
 }
 
-/* temporary -- we need a simple box-based list defined in XBL */
-tree.list {
-  border: 1px inset #CCD0DD;
-  /* same as in menulist.css */
-  margin: 1px 5px 2px;
-  /* use rows="#" in XUL to define height */
-}
-
 #ColorPreview {
   border: 1px inset #CCD0DD;
   -moz-margin-start: 10px;
@@ -158,11 +131,6 @@ tree.list {
   min-height: 50px;
 }
 
-#alignTypeSelect,
-label#alignLabel {
-  -moz-margin-start: 5px;
-}
-
 /* ::::: table properties dialog ::::: */
 
 #MoreFewerButton[more="0"] {
@@ -193,10 +161,6 @@ label#alignLabel {
 
 /* ::::: spelling dialog ::::: */
 
-#MisspelledWord {
-  font-weight: bold;
-}
-
 #ReplaceWordInput {
   min-width: 16em;
   width: 16em;
@@ -257,28 +221,29 @@ label#alignLabel {
   min-width: 16px;
 }
 
-#alignTypeSelect {
-  height: 34px;
+.align-menu > .menu-iconic-left > .menu-iconic-icon {
+  height: auto;
+  width: auto;
 }
 
 .align-menu[value="top"] {
-  list-style-image:url("chrome://editor/skin/icons/img-align-top.gif");
+  list-style-image:url("chrome://editor/skin/icons/img-align-top.gif") !important;
 }
 
 .align-menu[value="center"] {
-  list-style-image:url("chrome://editor/skin/icons/img-align-middle.gif");
+  list-style-image:url("chrome://editor/skin/icons/img-align-middle.gif") !important;
 }
 
 .align-menu[value="bottom"] {
-  list-style-image:url("chrome://editor/skin/icons/img-align-bottom.gif");
+  list-style-image:url("chrome://editor/skin/icons/img-align-bottom.gif") !important;
 }
 
 .align-menu[value="right"] {
-  list-style-image:url("chrome://editor/skin/icons/img-align-right.gif");
+  list-style-image:url("chrome://editor/skin/icons/img-align-right.gif") !important;
 }
 
 .align-menu[value="left"] {
-  list-style-image:url("chrome://editor/skin/icons/img-align-left.gif");
+  list-style-image:url("chrome://editor/skin/icons/img-align-left.gif") !important;
 }
 
 /* Don't change width/height of these without changing values in 
@@ -321,10 +286,6 @@ tree.AttributesTree {
 
 /* ::::: select edit dialog ::::: */
 
-#SelectTreeChildren::-moz-tree-cell(SelectSelCol, checked-false) {
-  background: url("chrome://global/skin/checkbox/cbox.gif") 50% 50% no-repeat;
-}
-
 #SelectTreeChildren::-moz-tree-cell(SelectSelCol, checked-true) {
   background: url("chrome://global/skin/checkbox/cbox-check.gif") 50% 50% no-repeat;
 }
diff --git a/EarlyBlue/global/button.css b/EarlyBlue/global/button.css
index 000a7e7e..5a2642b8 100644
--- a/EarlyBlue/global/button.css
+++ b/EarlyBlue/global/button.css
@@ -139,8 +139,8 @@ button[type="menu-button"] {
 .button-menu-dropmarker,
 .button-menubutton-dropmarker {
   margin: 1px;
-  min-width: 11px;
-  min-height: 11px;
+  width: 11px;
+  height: 11px;
   background-color: transparent;
   border: none;
 }
diff --git a/EarlyBlue/messenger/dialogs.css b/EarlyBlue/messenger/dialogs.css
index 0b2c29b8..7b1fc05d 100644
--- a/EarlyBlue/messenger/dialogs.css
+++ b/EarlyBlue/messenger/dialogs.css
@@ -67,27 +67,3 @@ menu.push[disabled="true"]:hover,
 menu.push[disabled="true"]:hover:active {
   color: #999999;
 }
-
-/* ::::: askSendFormat.xul ::::: */
-
-askSendFormat {
-  width: 40em;
-}
-
-#askImageBox {
- -moz-box-align: start;
-}
-
-#convertYes,
-#convertAltering {
-  list-style-image:url("chrome://global/skin/icons/alert-question.gif");
-}
-
-#convertNo {
-  list-style-image:url("chrome://global/skin/icons/alert-exclam.gif");
-}
-
-/* Workaround for bug 50217. Please remove this rule, when this bug is fixed. */
-#convertDefault {
-  list-style-image:url("chrome://global/skin/icons/alert-question.gif");
-}
diff --git a/EarlyBlue/messenger/messengercompose/messengercompose.css b/EarlyBlue/messenger/messengercompose/messengercompose.css
index 016a8524..d08a3cf9 100644
--- a/EarlyBlue/messenger/messengercompose/messengercompose.css
+++ b/EarlyBlue/messenger/messengercompose/messengercompose.css
@@ -98,15 +98,59 @@
   -moz-image-region: rect(294px 50px 315px 25px);
 }
 
-#button-stop {
-  list-style-image: url("chrome://communicator/skin/icons/communicatoricons.png");
-  -moz-image-region: rect(21px 25px 42px 0px);
+/* ::::: small primary toolbar buttons ::::: */
+
+/* TODO: correct coords!
+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(220px 19px 239px 0);
+}
+
+toolbar[iconsize="small"] > #button-send[disabled="true"] {
+  -moz-image-region: rect(220px 79px 239px 60px) !important;
+}
+
+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(180px 19px 199px 0);
+}
+
+toolbar[iconsize="small"] > #button-address[disabled="true"] {
+  -moz-image-region: rect(180px 79px 199px 60px) !important;
+}
+
+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(200px 19px 219px 0);
+}
+
+toolbar[iconsize="small"] > #button-attach[disabled="true"] {
+  -moz-image-region: rect(200px 79px 219px 60px) !important;
+}
+
+toolbar[iconsize="small"] > #spellingButton,
+toolbar[iconsize="small"] > toolbarpaletteitem > #spellingButton {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(160px 19px 179px 0);
+}
+
+toolbar[iconsize="small"] > #spellingButton[disabled="true"] {
+  -moz-image-region: rect(160px 79px 179px 60px) !important;
 }
 
-#button-stop[disabled="true"] {
-  -moz-image-region: rect(21px 50px 42px 25px);
+toolbar[iconsize="small"] > #button-save,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-save {
+  list-style-image: url("chrome://editor/skin/icons/editoricons-small.png");
+  -moz-image-region: rect(140px 19px 159px 0);
 }
 
+toolbar[iconsize="small"] > #button-save[disabled="true"] {
+  -moz-image-region: rect(140px 79px 159px 60px) !important;
+}
+*/
 #MsgHeadersToolbar {
   min-height: 0px; /* this undoes the min-height in toolbar.css */
 }
diff --git a/EarlyBlue/messenger/primaryToolbar.css b/EarlyBlue/messenger/primaryToolbar.css
index 1a28aff1..c902b584 100644
--- a/EarlyBlue/messenger/primaryToolbar.css
+++ b/EarlyBlue/messenger/primaryToolbar.css
@@ -175,7 +175,8 @@ toolbarpaletteitem > #button-delete {
 
 /* ::::: 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);
 }
@@ -184,7 +185,8 @@ toolbar[iconsize="small"] > #button-getmsg[disabled="true"] {
   -moz-image-region: rect(48px 32px 64px 16px);
 }
 
-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);
 }
@@ -193,7 +195,8 @@ toolbar[iconsize="small"] > #button-newmsg[disabled="true"] {
   -moz-image-region: rect(80px 32px 96px 16px);
 }
 
-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);
 }
@@ -202,7 +205,8 @@ toolbar[iconsize="small"] > #button-reply[disabled="true"] {
   -moz-image-region: rect(112px 32px 128px 16px);
 }
 
-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);
 }
@@ -211,7 +215,8 @@ toolbar[iconsize="small"] > #button-replyall[disabled="true"] {
   -moz-image-region: rect(128px 32px 144px 16px);
 }
 
-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);
 }
@@ -220,7 +225,8 @@ toolbar[iconsize="small"] > #button-forward[disabled="true"] {
   -moz-image-region: rect(32px 32px 48px 16px);
 }
 
-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);
 }
@@ -229,7 +235,8 @@ toolbar[iconsize="small"] > #button-file[disabled="true"] {
   -moz-image-region: rect(16px 32px 32px 16px);
 }
 
-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);
 }
@@ -238,7 +245,8 @@ toolbar[iconsize="small"] > #button-goback[disabled="true"] {
   -moz-image-region: rect(32px 32px 48px 16px);
 }
 
-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);
 }
@@ -247,7 +255,8 @@ toolbar[iconsize="small"] > #button-goforward[disabled="true"] {
   -moz-image-region: rect(48px 32px 64px 16px);
 }
 
-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);
 }
@@ -256,7 +265,8 @@ toolbar[iconsize="small"] > #button-next[disabled="true"] {
   -moz-image-region: rect(96px 32px 112px 16px);
 }
 
-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);
 }
@@ -265,7 +275,8 @@ toolbar[iconsize="small"] > #button-delete[disabled="true"] {
   -moz-image-region: rect(0 32px 16px 16px);
 }
 
-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);
 }
@@ -274,7 +285,8 @@ toolbar[iconsize="small"] > #button-mark[disabled="true"] {
   -moz-image-region: rect(64px 32px 80px 16px);
 }
 
-toolbar[iconsize="small"] > #button-junk {
+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);
 }
@@ -283,7 +295,8 @@ toolbar[iconsize="small"] > #button-junk[disabled="true"] {
   -moz-image-region: rect(192px 32px 208px 16px);
 }
 
-toolbar[iconsize="small"] > #button-print {
+toolbar[iconsize="small"] > #button-print,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-print {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
   -moz-image-region: rect(0 16px 16px 0);
 }
@@ -292,7 +305,8 @@ toolbar[iconsize="small"] > #button-print[disabled="true"] {
   -moz-image-region: rect(0 32px 16px 16px);
 }
 
-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);
 }
diff --git a/LCARStrek/communicator/communicator.css b/LCARStrek/communicator/communicator.css
index 4e1c8e41..e625580a 100644
--- a/LCARStrek/communicator/communicator.css
+++ b/LCARStrek/communicator/communicator.css
@@ -115,6 +115,13 @@ menubar[xpfe="false"] {
   margin: 0px !important;
 }
 
+/* ::::: iconic menus and menuitems ::::: */
+
+menu.menu-iconic > .menu-iconic-left,
+menuitem.menuitem-iconic > .menu-iconic-left {
+  display: -moz-box;
+}
+
 /* ::::: download manager ::::: */
 
 #downloadView > treechildren::-moz-tree-image(Name) {
diff --git a/LCARStrek/communicator/preferences.css b/LCARStrek/communicator/preferences.css
index 5b7c30d7..734a2ca7 100644
--- a/LCARStrek/communicator/preferences.css
+++ b/LCARStrek/communicator/preferences.css
@@ -51,38 +51,3 @@ prefwindow {
 dialogheader {
   -moz-margin-start: 3px;
 }
-
-/* File Field Widget */
-filefield {
-  margin: 2px 4px;
-  border: 1px solid #9C9CFF;
-}
-
-.fileFieldContentBox {
-  background-color: #000000;
-}
-
-filefield[disabled="true"] {
-  color: #8050B0;
-  border: 1px solid #8050B0;
-}
-
-.fileFieldIcon[disabled="true"] {
-  opacity: 0.4;
-}
-
-.fileFieldIcon {
-  width: 16px;
-  height: 16px;
-  margin-top: 1px;
-  margin-bottom: 1px;
-  -moz-margin-start: 1px;
-  -moz-margin-end: 4px;
-}
-
-.fileFieldLabel {
-  -moz-appearance: none;
-  background-color: transparent;
-  border: none;
-  margin: 0px;
-}
diff --git a/LCARStrek/editor/EditorDialog.css b/LCARStrek/editor/EditorDialog.css
index b39ee00e..d3873322 100644
--- a/LCARStrek/editor/EditorDialog.css
+++ b/LCARStrek/editor/EditorDialog.css
@@ -38,18 +38,6 @@
 
 @namespace url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-/*
-   THIS FILE IS LOCKED DOWN.  YOU ARE NOT ALLOWED TO MODIFY IT WITHOUT FIRST HAVING YOUR
-   CHANGES REVIEWED BY cmanske@netscape.com.
-*/
-
-/* The defaults are WAY to big! */
-groupbox {
-  margin:         2px 5px /* 4px 5px */;
-  padding-top:    2px;
-  padding-bottom: 4px;
-}
-
 .MinWidth5em {
   min-width: 5em;
 }
@@ -90,14 +78,6 @@ groupbox {
   font-weight: bold;
 }
 
-/* Use this with groove-thin in dialogs 
-   to add margins to top and bottom
-*/
-.tb-margin {
-  margin-top: 6px;
-  margin-bottom: 6px;
-}
-
 .color-well {
   width: 20px;
   height: 12px; 
@@ -115,10 +95,6 @@ groupbox {
   margin: 2px;
 }
 
-.menu-list[focused="true"] {
-  color: white;
-}
-
 #ColorPicker {
   -moz-user-focus: normal;
 }
@@ -146,14 +122,6 @@ groupbox {
   -moz-margin-end: 2px;
 }
 
-/* temporary -- we need a simple box-based list defined in XBL */
-tree.list {
-  border: 1px inset #9C9CFF;
-  /* same as in menulist.css */
-  margin: 1px 5px 2px;
-  /* use rows="#" in XUL to define height */
-}
-
 #ColorPreview {
   border: 1px inset #9C9CFF;
   -moz-margin-start:    10px;
@@ -177,11 +145,6 @@ tree.list {
   min-width: 16px;
 }
 
-#alignTypeSelect,
-label#alignLabel {
-  -moz-margin-start: 5px;
-}
-
 /* ::::: table properties dialog ::::: */
 
 #MoreFewerButton[more="0"] {
@@ -212,10 +175,6 @@ label#alignLabel {
 
 /* ::::: spelling dialog ::::: */
 
-#MisspelledWord {
-  font-weight: bold;
-}
-
 #ReplaceWordInput {
   min-width: 16em;
   width: 16em;
@@ -261,28 +220,29 @@ label#alignLabel {
   min-height: 10px;
 }
 
-#alignTypeSelect {
-  height: 34px;
+.align-menu > .menu-iconic-left > .menu-iconic-icon {
+  height: auto;
+  width: auto;
 }
 
 .align-menu[value="top"] {
-  list-style-image:url("chrome://editor/skin/icons/img-align-top.gif");
+  list-style-image:url("chrome://editor/skin/icons/img-align-top.gif") !important;
 }
 
 .align-menu[value="center"] {
-  list-style-image:url("chrome://editor/skin/icons/img-align-middle.gif");
+  list-style-image:url("chrome://editor/skin/icons/img-align-middle.gif") !important;
 }
 
 .align-menu[value="bottom"] {
-  list-style-image:url("chrome://editor/skin/icons/img-align-bottom.gif");
+  list-style-image:url("chrome://editor/skin/icons/img-align-bottom.gif") !important;
 }
 
 .align-menu[value="right"] {
-  list-style-image:url("chrome://editor/skin/icons/img-align-right.gif");
+  list-style-image:url("chrome://editor/skin/icons/img-align-right.gif") !important;
 }
 
 .align-menu[value="left"] {
-  list-style-image:url("chrome://editor/skin/icons/img-align-left.gif");
+  list-style-image:url("chrome://editor/skin/icons/img-align-left.gif") !important;
 }
 
 /* Don't change width/height of these without changing values in 
@@ -324,10 +284,6 @@ tree.AttributesTree {
 
 /* ::::: select edit dialog ::::: */
 
-#SelectTreeChildren::-moz-tree-cell(SelectSelCol, checked-false) {
-  background: url("chrome://global/skin/checkbox/cbox.gif") 50% 50% no-repeat;
-}
-
 #SelectTreeChildren::-moz-tree-cell(SelectSelCol, checked-true) {
   background: url("chrome://global/skin/checkbox/cbox-check.gif") 50% 50% no-repeat;
 }
diff --git a/LCARStrek/global/button.css b/LCARStrek/global/button.css
index 6b1d7b87..2d4f1e50 100644
--- a/LCARStrek/global/button.css
+++ b/LCARStrek/global/button.css
@@ -162,8 +162,8 @@ button[type="menu-button"] {
 .button-menubutton-dropmarker {
   -moz-border-radius: 3px;
   margin: 1px;
-  min-width: 11px;
-  min-height: 11px;
+  width: 11px;
+  height: 11px;
 }
 
 /* ::::: plain buttons ::::: */
diff --git a/LCARStrek/messenger/dialogs.css b/LCARStrek/messenger/dialogs.css
index b66df732..5616572b 100644
--- a/LCARStrek/messenger/dialogs.css
+++ b/LCARStrek/messenger/dialogs.css
@@ -67,27 +67,3 @@ menu.push[disabled="true"]:hover,
 menu.push[disabled="true"]:hover:active {
   color: #8050B0;
 }
-
-/* ::::: askSendFormat.xul ::::: */
-
-askSendFormat {
-  width: 40em;
-}
-
-#askImageBox {
- -moz-box-align: start;
-}
-
-#convertYes,
-#convertAltering {
-  list-style-image:url("chrome://global/skin/icons/alert-question.gif");
-}
-
-#convertNo {
-  list-style-image:url("chrome://global/skin/icons/alert-exclam.gif");
-}
-
-/* Workaround for bug 50217. Please remove this rule, when this bug is fixed. */
-#convertDefault {
-  list-style-image:url("chrome://global/skin/icons/alert-question.gif");
-}
diff --git a/LCARStrek/messenger/primaryToolbar.css b/LCARStrek/messenger/primaryToolbar.css
index 2c679948..154e2765 100644
--- a/LCARStrek/messenger/primaryToolbar.css
+++ b/LCARStrek/messenger/primaryToolbar.css
@@ -255,7 +255,8 @@ toolbarpaletteitem > #button-delete {
 
 /* ::::: 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);
 }
@@ -270,7 +271,8 @@ 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);
 }
@@ -284,7 +286,8 @@ 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);
 }
@@ -299,7 +302,8 @@ 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);
 }
@@ -314,7 +318,8 @@ 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);
 }
@@ -329,7 +334,8 @@ 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);
 }
@@ -344,7 +350,8 @@ 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);
 }
@@ -359,7 +366,8 @@ 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);
 }
@@ -374,7 +382,8 @@ 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);
 }
@@ -389,7 +398,8 @@ 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);
 }
@@ -403,7 +413,8 @@ 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);
 }
@@ -418,7 +429,8 @@ toolbar[iconsize="small"] > #button-mark[open="true"] {
   -moz-image-region: rect(64px 48px 80px 32px);
 }
 
-toolbar[iconsize="small"] > #button-junk {
+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);
 }
@@ -432,7 +444,8 @@ toolbar[iconsize="small"] > #button-junk:not([disabled="true"]):hover:active {
   -moz-image-region: rect(192px 48px 208px 32px);
 }
 
-toolbar[iconsize="small"] > #button-print {
+toolbar[iconsize="small"] > #button-print,
+toolbar[iconsize="small"] > toolbarpaletteitem > #button-print {
   list-style-image: url("chrome://communicator/skin/icons/communicatoricons-small.png");
   -moz-image-region: rect(0 16px 16px 0);
 }
@@ -446,7 +459,8 @@ 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);
 }