 core/themes/classy/css/components/container-inline.css         | 10 +++++++---
 .../stable/css/system/components/container-inline.module.css   |  2 +-
 2 files changed, 8 insertions(+), 4 deletions(-)

diff --git a/core/themes/classy/css/components/container-inline.css b/core/themes/classy/css/components/container-inline.css
index 785e4de9d0..f58abfe472 100644
--- a/core/themes/classy/css/components/container-inline.css
+++ b/core/themes/classy/css/components/container-inline.css
@@ -7,11 +7,15 @@
 .container-inline .label:after {
   content: ':';
 }
-.form-type-radios .container-inline label:after {
+.container-inline .form-radios label:after {
   content: '';
 }
-.form-type-radios .container-inline .form-type-radio {
-  margin: 0 1em;
+.container-inline .form-radios .form-type-radio {
+  margin-right: 1em;
+}
+[dir="rtl"] .container-inline .form-radios .form-type-radio {
+  margin-right: 0;
+  margin-left: 1em;
 }
 .container-inline .form-actions,
 .container-inline.form-actions {
diff --git a/core/themes/stable/css/system/components/container-inline.module.css b/core/themes/stable/css/system/components/container-inline.module.css
index b68da6509c..ba99a36563 100644
--- a/core/themes/stable/css/system/components/container-inline.module.css
+++ b/core/themes/stable/css/system/components/container-inline.module.css
@@ -5,7 +5,7 @@
 
 .container-inline div,
 .container-inline label {
-  display: inline;
+  display: inline-block;
 }
 /* Details contents always need to be rendered as block. */
 .container-inline .details-wrapper {
