diff --git a/core/modules/datetime/templates/datetime-wrapper.html.twig b/core/modules/datetime/templates/datetime-wrapper.html.twig
index a4acf70..e31bfa8 100644
--- a/core/modules/datetime/templates/datetime-wrapper.html.twig
+++ b/core/modules/datetime/templates/datetime-wrapper.html.twig
@@ -15,12 +15,14 @@
  * @ingroup themeable
  */
 #}
-{% if title %}
-  <h4 class="label">
-    {% trans %}{{ title|passthrough }}{{ required|passthrough }}{% endtrans %}
-  </h4>
-{% endif %}
-{{ content }}
-{% if description %}
-  <div class="description">{{ description }}</div>
-{% endif %}
+<fieldset class="fieldset-no-border">
+  {% if title %}
+    <legend class="label">
+      {% trans %}{{ title|passthrough }}{{ required|passthrough }}{% endtrans %}
+    </legend>
+  {% endif %}
+  {{ content }}
+  {% if description %}
+    <div class="description">{{ description }}</div>
+  {% endif %}
+</fieldset>
diff --git a/core/modules/system/css/system.theme.css b/core/modules/system/css/system.theme.css
index 4e83886..9f92a65 100644
--- a/core/modules/system/css/system.theme.css
+++ b/core/modules/system/css/system.theme.css
@@ -99,6 +99,13 @@ abbr.form-required, abbr.tabledrag-changed, abbr.ajax-changed {
   margin-left: 0;
   margin-right: 0;
 }
+fieldset.fieldset-no-border {
+  border: none;
+  padding: 0;
+}
+fieldset.fieldset-no-border legend {
+  text-transform: none;
+}
 
 /**
  * Inline items.