diff --git a/core/modules/system/css/system.theme.css b/core/modules/system/css/system.theme.css
index 48fc3dd..68bbe4f 100644
--- a/core/modules/system/css/system.theme.css
+++ b/core/modules/system/css/system.theme.css
@@ -103,14 +103,23 @@ abbr.ajax-changed {
 .form-item select.error {
   border: 2px solid red;
 }
-.button,
-.image-button {
+.form-item + .button,
+.form-item + .image-button,
+.form-actions * + .button,
+.form-actions * + .image-button {
   margin-left: 1em;
-  margin-right: 1em;
 }
-.button:first-child,
-.image-button:first-child {
+.form-type-file + .button {
   margin-left: 0;
+}
+*[dir="rtl"] .form-item + .button,
+*[dir="rtl"] .form-item + .image-button,
+*[dir="rtl"] .form-actions * + .button,
+*[dir="rtl"] .form-actions * + .image-button {
+  margin-left: inherit;
+  margin-right: 1em;
+}
+*[dir="rtl"] .form-type-file + .button {
   margin-right: 0;
 }