diff --git a/css/webform.element.horizontal_rule.css b/css/webform.element.horizontal_rule.css
index d11dbdd3..a5d4b8ad 100644
--- a/css/webform.element.horizontal_rule.css
+++ b/css/webform.element.horizontal_rule.css
@@ -46,6 +46,7 @@ hr.webform-horizontal-rule--dotted.webform-horizontal-rule--thick {
 hr.webform-horizontal-rule--flaired {
   overflow: visible; /* For IE */
   height: 30px;
+  background-color: transparent;
   border-style: solid;
   border-color: #666;
   border-width: 1px 0 0 0;
diff --git a/css/webform.theme.claro.css b/css/webform.theme.claro.css
new file mode 100644
index 00000000..42690e1b
--- /dev/null
+++ b/css/webform.theme.claro.css
@@ -0,0 +1,152 @@
+/**
+ * @file
+ * Claro theme styles.
+ */
+
+/******************************************************************************/
+/* Form */
+/******************************************************************************/
+
+/**
+ * Only add margin to bottom of the form item.
+ *
+ * @see /admin/structure/webform/manage/contact/element/name/edit
+ */
+.webform-tabs .form-item  {
+  margin-top: 0;
+}
+
+/******************************************************************************/
+/* Messages */
+/******************************************************************************/
+
+/**
+ * Fix webform promotion message link color.
+ *
+ * @see /admin/structure/webform
+ * @see webform.promotions.css
+ */
+.webform-message .messages.messages--webform a {
+  color: #003cc5;
+}
+
+/**
+ * Add styles to default (info) message,
+ */
+.messages.messages--info {
+  color: #fff;
+  background-color: #353641;
+}
+[dir="rtl"] .messages.messages--info {
+  border-color: #0074bd transparent #0074bd #0074bd;
+  box-shadow: 8px 0 0 #0074bd;
+  margin-left: 0;
+}
+
+/******************************************************************************/
+/* Other */
+/******************************************************************************/
+
+/**
+ * Tables.
+ */
+th.webform-results-table__icon.sortable-heading {
+  padding: 0 1rem;
+}
+
+/******************************************************************************/
+/* Webform */
+/******************************************************************************/
+
+/**
+ * Element types (/admin/structure/webform/manage/[webform_id]/element/add)
+ */
+.webform-ui-element-type-select-form > details > .claro-details__wrapper.details-wrapper {
+  padding: 0;
+}
+
+.webform-details-toggle-state {
+  color: #003cc5;
+}
+
+/******************************************************************************/
+/* Claro */
+/******************************************************************************/
+
+/**
+ * Hide 'loading...' message when displayed in an inline container.
+ *
+ * @see /admin/structure/webform
+ */
+.container-inline div.claro-autocomplete__message[hidden] {
+  display: none;
+}
+
+/******************************************************************************/
+/* jQuery UI */
+/******************************************************************************/
+
+/**
+ * jQuery UI tooltip.
+ *
+ * Used for webform element help (tooltips).
+ *
+ * @see core/assets/vendor/jquery.ui/themes/base/tabs.css
+ */
+.ui-tooltip.ui-widget {
+  background: #fe6;;
+  border: 1px solid #ed5;
+  border-radius: 2px;
+}
+
+.ui-tooltip hr {
+  background: #666;
+  margin: .3em 0;
+  height: 1px;
+}
+
+.ui-tooltip code {
+  font-weight: bold;
+  white-space: nowrap;
+  background-color: #f5f5f2;
+  font-size: .9em;
+  padding: .2em;
+}
+
+/**
+ * jQuery UI tabs.
+ */
+.webform-tabs.ui-tabs .ui-tabs-nav li {
+  padding: 0 5px;
+}
+
+.webform-tabs.ui-tabs .ui-tabs-panel {
+  padding: 0;
+}
+
+.webform-tabs .ui-tabs-tab.ui-tab a {
+  border-radius: 0;
+}
+
+.webform-tabs .ui-tabs-active.ui-state-active a {
+  border-bottom: 3px solid #003cc5;
+}
+
+/**
+ * System tray divider.
+ */
+.ui-dialog.ui-dialog-off-canvas .ui-resizable-w {
+  background-color: #bfbfba;
+  border: 1px solid #6b6b6b;
+  border-width: 1px 2px;
+}
+
+/* System tray title bar */
+.ui-dialog.ui-dialog-off-canvas {
+  background: #fff;
+}
+
+.ui-dialog.ui-dialog-off-canvas .ui-dialog-titlebar {
+  border-radius: 0;
+}
+
diff --git a/includes/webform.theme.inc b/includes/webform.theme.inc
index ccba1e15..1fc50e1f 100644
--- a/includes/webform.theme.inc
+++ b/includes/webform.theme.inc
@@ -272,6 +272,15 @@ function webform_preprocess_radios(&$variables) {
   _webform_preprocess_options($variables);
 }
 
+/**
+ * Prepares variable for status_messages.
+ */
+function webform_preprocess_status_messages(&$variables) {
+  if (!isset($variables['status_headings']['info'])) {
+    $variables['status_headings']['info'] = t('Information message');
+  }
+}
+
 /******************************************************************************/
 // Preprocess tables.
 /******************************************************************************/
diff --git a/modules/webform_ui/src/Form/WebformUiElementFormBase.php b/modules/webform_ui/src/Form/WebformUiElementFormBase.php
index 2831e1de..96215897 100644
--- a/modules/webform_ui/src/Form/WebformUiElementFormBase.php
+++ b/modules/webform_ui/src/Form/WebformUiElementFormBase.php
@@ -229,6 +229,7 @@ abstract class WebformUiElementFormBase extends FormBase implements WebformUiEle
           '#title' => $this->t('Change'),
           '#url' => new Url('entity.webform_ui.change_element', $route_parameters),
           '#attributes' => WebformDialogHelper::getModalDialogAttributes(WebformDialogHelper::DIALOG_NORMAL, ['button', 'button--small']),
+          '#prefix' => ' ',
         ];
       }
     }
diff --git a/webform.libraries.yml b/webform.libraries.yml
index 2a1be0bf..c1a884d1 100644
--- a/webform.libraries.yml
+++ b/webform.libraries.yml
@@ -293,6 +293,12 @@ webform.tooltip:
 
 # Theme
 
+webform.theme.claro:
+  version: VERSION
+  css:
+    theme:
+      css/webform.theme.claro.css: {}
+
 webform.theme.classy:
   version: VERSION
   css: