diff --git a/adhocracy-plus/assets/scss/_form.scss b/adhocracy-plus/assets/scss/_form.scss
index ac96572ef..06746e941 100644
--- a/adhocracy-plus/assets/scss/_form.scss
+++ b/adhocracy-plus/assets/scss/_form.scss
@@ -188,7 +188,8 @@ div.cke_focus {
     .filter-bar__spaced {
         margin-bottom: 0.5 * $spacer;
         display: flex;
-
+        flex-wrap: nowrap;
+        
         div,
         .dropdown > button {
             min-width: revert;
diff --git a/adhocracy-plus/assets/scss/components/_badge.scss b/adhocracy-plus/assets/scss/components/_badge.scss
index 5493349cd..8a58b8a8b 100644
--- a/adhocracy-plus/assets/scss/components/_badge.scss
+++ b/adhocracy-plus/assets/scss/components/_badge.scss
@@ -1,3 +1,4 @@
+
 .badge {
     display: inline-block;
     background-color: $text-color;
@@ -5,6 +6,7 @@
     font-size: $font-size-xs;
     font-weight: normal;
     border-radius: 0.4em;
+    margin-bottom: 0.2em;
     padding: 0.2em 0.7em;
     text-align: start;
     white-space: normal;
diff --git a/adhocracy-plus/assets/scss/components/_organisation.scss b/adhocracy-plus/assets/scss/components/_organisation.scss
index cffbb1c1b..d8cad222c 100644
--- a/adhocracy-plus/assets/scss/components/_organisation.scss
+++ b/adhocracy-plus/assets/scss/components/_organisation.scss
@@ -36,11 +36,11 @@
 }
 
 .organisation__social-link {
-    width: 2rem;
-    height: 2rem;
+    width: 4rem;
+    height: 4rem;
     position: relative;
     background-color: $brand-secondary;
-    border-radius: 8rem;
+    border-radius: 10rem;
 
     i {
         position: absolute;
@@ -48,6 +48,7 @@
         left: 50%;
         transform: translate(-50%, -50%);
         width: 50%;
-        color: $white;
+        font-size: 1.8rem;
+        color: $black;
     }
 }
diff --git a/apps/contrib/templates/a4_candy_contrib/component_library.html b/apps/contrib/templates/a4_candy_contrib/component_library.html
index d945337d0..e291502f1 100644
--- a/apps/contrib/templates/a4_candy_contrib/component_library.html
+++ b/apps/contrib/templates/a4_candy_contrib/component_library.html
@@ -1,8 +1,9 @@
 {% extends 'base.html' %}
 
-{% block title %}Component Library — {{ block.super }}{% endblock %}
+{% block title %}Component Library — {{ block.super }}{% endblock title %}
 
 {% block content %}
+{# djlint:off #}
 <div class="container">
     <div class="row">
         <div class="col-md-3">
@@ -1525,6 +1526,26 @@ <h1 class="item-detail__title">Item Detail Title</h1>
 
                     <div class="item-detail__labels">
                         <div class="badge badge--big">Label</div>
+                        <div class="badge badge--big">Label</div>
+                        <div class="badge badge--big">Label</div>
+                        <div class="badge badge--big">Label</div>
+                        <div class="badge badge--big">Label</div>
+                        <div class="badge badge--big">Label</div>
+                        <div class="badge badge--big">Label</div>
+                        <div class="badge badge--big">Label</div>
+                        <div class="badge badge--big">Label</div>
+                        <div class="badge badge--big">Label</div>
+                        <div class="badge badge--big">Label</div>
+                        <div class="badge badge--big">Label</div>
+                        <div class="badge badge--big">Label</div>
+                        <div class="badge badge--big">Label</div>
+                        <div class="badge badge--big">Label</div>
+                        <div class="badge badge--big">Label</div>
+                        <div class="badge badge--big">Label</div>
+                        <div class="badge badge--big">Label</div>
+                        <div class="badge badge--big">Label</div>
+                        <div class="badge badge--big">Label</div>
+                        <div class="badge badge--big">Label</div>
                     </div>
 
                     <div class="item-detail__content">
@@ -2425,4 +2446,5 @@ <h2 id="cl-upload">Upload</h2>
         </div>
     </div>
 </div>
+{# djlint:on #}
 {% endblock content %}
diff --git a/changelog/2732.md b/changelog/2732.md
new file mode 100644
index 000000000..cebe706d6
--- /dev/null
+++ b/changelog/2732.md
@@ -0,0 +1 @@
+- **Fixed**: Add space for multi-row badges
diff --git a/changelog/2874.md b/changelog/2874.md
new file mode 100644
index 000000000..9af3a528c
--- /dev/null
+++ b/changelog/2874.md
@@ -0,0 +1 @@
+- **Fixed**: Overflow and wrap on Brainstorming module filters