diff --git a/webapp/components/FilterMenu/FollowingFilter.vue b/webapp/components/FilterMenu/FollowingFilter.vue
index 6dc93aa41..cc0e3872b 100644
--- a/webapp/components/FilterMenu/FollowingFilter.vue
+++ b/webapp/components/FilterMenu/FollowingFilter.vue
@@ -5,22 +5,26 @@
     class="following-filter">
     <template #filter-follower>
       <li class="item follower-item">
-        <labeled-button
+        <base-button        
           icon="user-plus"
           :label="$t('filter-menu.following')"
           :filled="filteredByUsersFollowed"
           :title="$t('contribution.filterFollow')"
           @click="toggleFilteredByFollowed(currentUser.id)"
-        />
+        >
+          {{ $t('contribution.filterFollow') }}
+        </base-button>
       </li>
       <li class="item posts-in-my-groups-item">
-        <labeled-button
+        <base-button
           icon="users"
           :label="$t('filter-menu.my-groups')"
           :filled="filteredByPostsInMyGroups"
           :title="$t('contribution.filterMyGroups')"
           @click="toggleFilteredByMyGroups()"
-        />
+        >
+          {{ $t('contribution.filterMyGroups') }}
+        </base-button>
       </li>
     </template>
   </filter-menu-section>
diff --git a/webapp/components/FilterMenu/PostTypeFilter.vue b/webapp/components/FilterMenu/PostTypeFilter.vue
index 515282782..75a5085d5 100644
--- a/webapp/components/FilterMenu/PostTypeFilter.vue
+++ b/webapp/components/FilterMenu/PostTypeFilter.vue
@@ -5,14 +5,16 @@
     class="following-filter"
   >
     <template #filter-follower>
-      <li class="item all-item">
-        <labeled-button
+      <li class="item all-item">        
+        <base-button
           icon="check"
           :label="$t('filter-menu.all')"
           :filled="filteredPostTypes.length === 0"
           :title="$t('filter-menu.all')"
           @click="togglePostType(null)"
-        />
+        >
+          {{ $t('filter-menu.all') }}
+        </base-button>
       </li>
       <li class="item article-item">
         <labeled-button