-.person-icon {
- list-style-image: url("chrome://messenger/skin/addressbook/icons/abcard.gif");
- margin: 0px 3px 0px 3px;
+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"] > #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);
+}
+
+toolbar[iconsize="small"] > #button-save[disabled="true"] {
+ -moz-image-region: rect(224px 32px 140px 16px);
+}
+
+#MsgHeadersToolbar {
+ min-height: 0px; /* this undoes the min-height in toolbar.css */