diff --git a/core/modules/system/css/system.theme.css b/core/modules/system/css/system.theme.css
index 37623e6..73bca26 100644
--- a/core/modules/system/css/system.theme.css
+++ b/core/modules/system/css/system.theme.css
@@ -103,15 +103,19 @@ abbr.ajax-changed {
 .form-item select.error {
   border: 2px solid red;
 }
-.button,
-.image-button {
+
+/*
+ * Add spacing before buttons when followed by another button, or part of an
+ * inline form.
+ */
+.button + .button,
+.button + .image-button,
+.image-button + .image-button,
+.image-button + .button,
+.dropbutton-wrapper + .button,
+.container-inline .button,
+.container-inline .image-button {
   margin-left: 1em;
-  margin-right: 1em;
-}
-.button:first-child,
-.image-button:first-child {
-  margin-left: 0;
-  margin-right: 0;
 }
 
 /**
@@ -133,6 +137,7 @@ abbr.ajax-changed {
   margin-bottom: 0;
 }
 
+
 /**
  * Markup generated by #type 'more_link'.
  */