diff --git a/core/misc/dropbutton/dropbutton.base.css b/core/misc/dropbutton/dropbutton.base.css
index 8eca580..1c05997 100644
--- a/core/misc/dropbutton/dropbutton.base.css
+++ b/core/misc/dropbutton/dropbutton.base.css
@@ -8,7 +8,7 @@
  * When a dropbutton has only one option, it is simply a button.
  */
 .dropbutton-wrapper,
-.dropbutton-wrapper * {
+.dropbutton-wrapper div {
   -moz-box-sizing: border-box;
   -webkit-box-sizing: border-box;
   box-sizing: border-box;
@@ -19,9 +19,10 @@
 }
 .dropbutton-wrapper {
   min-height: 1em;
+  position: relative;
 }
 .dropbutton-widget {
-  display: inline-block;
+  display: block;
 }
 /* UL styles are over-scoped in core, so this selector needs weight parity. */
 .dropbutton-widget .dropbutton-content {
@@ -45,12 +46,11 @@
  * The arrow is created using border on a zero-width, zero-height span.
  * The arrow inherits the link color, but can be overridden with border colors.
  */
-.dropbutton-multiple {
-  position: relative;
-}
 .dropbutton-multiple .dropbutton-widget {
-  display: block;
   padding-right: 2em; /* LTR */
+}
+.dropbutton-widget {
+  display: block;
   position: absolute;
   right: 0; /* LTR */
 }
@@ -89,7 +89,7 @@
   line-height: 0;
   position: absolute;
   right: 0.6667em; /* LTR */
-  top: 0.667em;
+  top: 0.767em;
   width: 0;
 }
 .dropbutton-multiple.open .dropbutton-arrow {
diff --git a/core/misc/dropbutton/dropbutton.theme-rtl.css b/core/misc/dropbutton/dropbutton.theme-rtl.css
index a5c6c4e..9d6456c 100644
--- a/core/misc/dropbutton/dropbutton.theme-rtl.css
+++ b/core/misc/dropbutton/dropbutton.theme-rtl.css
@@ -8,3 +8,7 @@
   border-left: 1px solid #e8e8e8;
   border-right: 0 none;
 }
+.dropbutton-multiple .dropbutton-content li > * {
+  margin-left: 0.25em;
+  margin-right: 0;
+}
diff --git a/core/misc/dropbutton/dropbutton.theme.css b/core/misc/dropbutton/dropbutton.theme.css
index 2e52c1c..9c54b73 100644
--- a/core/misc/dropbutton/dropbutton.theme.css
+++ b/core/misc/dropbutton/dropbutton.theme.css
@@ -15,13 +15,9 @@
 .dropbutton-widget:hover {
   border-color: #b8b8b8;
 }
-.dropbutton-content {
-  line-height: 1.333;
-}
 .dropbutton-content li > * {
-  margin-right: 0.3333em;
   overflow: hidden;
-  padding: 0.25em 0.75em;
+  padding: 0.2em 0.5em;
   white-space: nowrap;
 }
 .dropbutton-content li + li {
@@ -30,3 +26,6 @@
 .dropbutton-multiple .dropbutton-content {
   border-right: 1px solid #e8e8e8; /* LTR */
 }
+.dropbutton-multiple .dropbutton-content li > * {
+  margin-right: 0.25em; /* LTR */
+}