diff --git a/web/themes/contrib/civictheme/assets/sass/layout_builder/_layout_builder.scss b/web/themes/contrib/civictheme/assets/sass/layout_builder/_layout_builder.scss
index a685b51a9..3f86977a3 100644
--- a/web/themes/contrib/civictheme/assets/sass/layout_builder/_layout_builder.scss
+++ b/web/themes/contrib/civictheme/assets/sass/layout_builder/_layout_builder.scss
@@ -34,19 +34,6 @@
               cursor: move;
               background-color: #fff;
               position: relative;
-
-              div.contextual {
-                display: contents;
-
-                ul {
-                  border: 1px solid;
-
-                  li {
-                    list-style: none;
-                    display: list-item;
-                  }
-                }
-              }
             }
 
             .block.block-layout-builder [tabindex='-1'] {
diff --git a/web/themes/contrib/civictheme/includes/layout.inc b/web/themes/contrib/civictheme/includes/layout.inc
index b21a002ec..aff8ff344 100644
--- a/web/themes/contrib/civictheme/includes/layout.inc
+++ b/web/themes/contrib/civictheme/includes/layout.inc
@@ -14,3 +14,10 @@ function civictheme_preprocess_layout__three_columns(array &$variables): void {
   $variables['is_contained'] = $variables['settings']['is_contained'] ?? FALSE;
   $variables['vertical_spacing'] = $variables['settings']['vertical_spacing'] ?? 'auto';
 }
+
+/**
+ * Implements hook_preprocess_HOOK().
+ */
+function civictheme_preprocess_block__layout_builder(array &$variables): void {
+  $variables['modifier_class'] = FALSE;
+}
diff --git a/web/themes/contrib/civictheme/templates/misc/links.html.twig b/web/themes/contrib/civictheme/templates/misc/links.html.twig
new file mode 100644
index 000000000..0e14cb1b2
--- /dev/null
+++ b/web/themes/contrib/civictheme/templates/misc/links.html.twig
@@ -0,0 +1,28 @@
+{#
+/**
+ * @file
+ * CivicTheme templete override implementation for a set of links.
+ */
+#}
+{% if links -%}
+  {%- if heading -%}
+    {%- if heading.level -%}
+      <{{ heading.level }}{{ heading.attributes }}>{{ heading.text }}</{{ heading.level }}>
+    {%- else -%}
+      <h2{{ heading.attributes }}>{{ heading.text }}</h2>
+    {%- endif -%}
+  {%- endif -%}
+  <ul{{ attributes }} class="{{ modifier_class }}">
+    {%- for item in links -%}
+      <li{{ item.attributes }}>
+        {%- if item.link -%}
+          {{ item.link }}
+        {%- elseif item.text_attributes -%}
+          <span{{ item.text_attributes }}>{{ item.text }}</span>
+        {%- else -%}
+          {{ item.text }}
+        {%- endif -%}
+      </li>
+    {%- endfor -%}
+  </ul>
+{%- endif %}