-.toolbarbutton-1 > .toolbarbutton-box,
-.toolbarbutton-1 > .toolbarbutton-menubutton-box > .toolbarbutton-menubutton-button > .toolbarbutton-box,
-.toolbarbutton-1[open="true"] > .toolbarbutton-menubutton-box > .toolbarbutton-menubutton-button > .toolbarbutton-box,
-.toolbarbutton-1[disabled="true"]:hover:active > .toolbarbutton-box,
-.toolbarbutton-1[disabled="true"][buttondown="true"] > .toolbarbutton-menubutton-box > .toolbarbutton-menubutton-button > .toolbarbutton-box
-{
- padding : 1px;
+.toolbarbutton-1,
+.toolbarbutton-1 > .toolbarbutton-menubutton-button,
+.toolbarbutton-1[disabled="true"]:hover:active,
+.toolbarbutton-1[disabled="true"]:hover:active > .toolbarbutton-menubutton-button {
+ padding: 1px 2px;
+}
+
+.toolbarbutton-1:hover:active,
+.toolbarbutton-1[open="true"],
+.toolbarbutton-1:hover:active > .toolbarbutton-menubutton-button {
+ padding-top: 2px;
+ padding-bottom: 0px;
+ -moz-padding-start: 3px;
+ -moz-padding-end: 1px;
+}
+
+.toolbarbutton-1[type="menu"] {
+ -moz-binding: url("chrome://global/content/bindings/toolbarbutton.xml#menu-vertical");
+}
+
+/* ::::: small primary toolbar buttons ::::: */
+
+toolbar[mode="text"] .toolbarbutton-1,
+toolbar[mode="icons"] .toolbarbutton-1,
+toolbar[iconsize="small"] .toolbarbutton-1,
+toolbar[mode="text"] .toolbarbutton-menubutton-button,
+toolbar[mode="icons"] .toolbarbutton-menubutton-button,
+toolbar[iconsize="small"] .toolbarbutton-menubutton-button {
+ min-width: 0px;
+ min-height: 0px;
+}
+
+toolbar[mode="text"] .toolbarbutton-menubutton-dropmarker {
+ padding-top: 4px;
+ padding-bottom: 8px;
+ -moz-padding-start: 1px;
+ -moz-padding-end: 1px;
+}
+
+toolbar[mode="icons"] .toolbarbutton-menubutton-dropmarker,
+toolbar[iconsize="small"] .toolbarbutton-menubutton-dropmarker {
+ padding-top: 0px;
+ padding-bottom: 13px;
+ -moz-padding-start: 1px;
+ -moz-padding-end: 1px;
+}
+
+toolbar[mode="text"] .toolbarbutton-1[type="menu-button"]:hover:active > .toolbarbutton-menubutton-dropmarker,
+toolbar[mode="text"] .toolbarbutton-1[type="menu-button"][open="true"] > .toolbarbutton-menubutton-dropmarker {
+ padding-top: 5px;
+ padding-bottom: 7px;
+ -moz-padding-start: 0px;
+ -moz-padding-end: 2px;