diff --git a/core/misc/machine-name.js b/core/misc/machine-name.js
index 0707714..fceb5a0 100644
--- a/core/misc/machine-name.js
+++ b/core/misc/machine-name.js
@@ -90,9 +90,9 @@
         var $preview = $('<span class="machine-name-value">' + options.field_prefix + Drupal.checkPlain(machine) + options.field_suffix + '</span>');
         $suffix.empty();
         if (options.label) {
-          $suffix.append(' ').append('<span class="machine-name-label">' + options.label + ':</span>');
+          $suffix.append('<span class="machine-name-label">' + options.label + ':</span>');
         }
-        $suffix.append(' ').append($preview);
+        $suffix.append($preview);
 
         // If the machine name cannot be edited, stop further processing.
         if ($target.is(':disabled')) {
@@ -109,7 +109,7 @@
         };
         // If it is editable, append an edit link.
         var $link = $('<span class="admin-link"><button type="button" class="link">' + Drupal.t('Edit') + '</button></span>').on('click', eventData, clickEditHandler);
-        $suffix.append(' ').append($link);
+        $suffix.append($link);
 
         // Preview the machine name in realtime when the human-readable name
         // changes, but only if there is no machine name yet; i.e., only upon
diff --git a/core/modules/system/css/system.admin.css b/core/modules/system/css/system.admin.css
index a363e6f..18fe6cc 100644
--- a/core/modules/system/css/system.admin.css
+++ b/core/modules/system/css/system.admin.css
@@ -78,6 +78,14 @@ div.admin .expert-link {
 /**
  * Quick inline admin links.
  */
+small .admin-link {
+  margin-left: 0.3em; /* LTR */
+  white-space: nowrap;
+}
+[dir="rtl"] small .admin-link {
+  margin-right: 0.3em;
+  margin-left: 0;
+}
 small .admin-link:before {
   content: '[';
 }
@@ -86,6 +94,19 @@ small .admin-link:after {
 }
 
 /**
+ * Quick inline machine name label.
+ */
+small .machine-name-label {
+  margin-right: 0.3em; /* LTR */
+  float: left; /* LTR */
+}
+[dir="rtl"] small .machine-name-label {
+  margin-left: 0.3em;
+  margin-right: 0;
+  float: right;
+}
+
+/**
  * Modules page.
  */
 #system-modules thead > tr {