diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index d3062584a..1acec03b0 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -267,7 +267,11 @@
       "happy": "Glücklich",
       "surprised": "Erstaunt"
     },
-    "filterALL": "Alle Beiträge anzeigen",
+    "filterMasonryGrid": {
+      "noFilter":"Beiträge filtern",
+      "myTheme":"Meine Themen",
+      "myFriends":"Beiträge von meinen Freunden"
+    },
     "filterFollow": "Beiträge von Benutzern filtern, denen ich folge",
     "inappropriatePicture": "Dieses Bild kann für einige Menschen unangemessen sein.",
     "languageSelectLabel": "Sprache Deines Beitrags",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index c4bb105cc..b47bb95be 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -267,7 +267,11 @@
       "happy": "Happy",
       "surprised": "Surprised"
     },
-    "filterALL": "View all contributions",
+    "filterMasonryGrid": {
+      "noFilter": "Filter Posts",
+      "myTheme": "My Themes",
+      "myFriends": "Posts From My Friends"
+    },
     "filterFollow": "Filter contributions from users I follow",
     "inappropriatePicture": "This image may be inappropriate for some people.",
     "languageSelectLabel": "Language of your contribution",
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index 09e51f7cc..61a945e1f 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -12,27 +12,40 @@
         column-span="fullWidth"
         style="z-index: 1"
       >
-        <span v-if="postsFilter['categories_some']">
-          <ds-chip
-            v-for="filter in postsFilter.categories_some.id_in"
-            @remove="removeFilter"
-            removable
-            :key="filter"
-            color="inverse"
-            size="large"
+        <ds-button
+          class="my-filter-button"
+          v-if="!postsFilter['categories_some'] && !postsFilter['author']" 
+          :icon="filterButtonIcon" 
+          right 
+          @click="showFilter = !showFilter">
+          {{ $t('contribution.filterMasonryGrid.noFilter') }}
+        </ds-button>
+
+        <ds-button 
+          class="my-filter-button" 
+          v-if="postsFilter['categories_some']" 
+          :icon="filterButtonIcon" 
+          right 
+          @click="showFilter = !showFilter">
+          {{ $t('contribution.filterMasonryGrid.myTheme') }}
+        </ds-button>
+
+        <ds-button 
+          class="my-filter-button" 
+          v-if="postsFilter['author']" 
+          :icon="filterButtonIcon" 
+          right 
+          @click="showFilter = !showFilter"
           >
-            {{ filter }}
-          </ds-chip>
-        </span>
-        <ds-button :icon="filterButtonIcon" right @click="showFilter = !showFilter">
-          {{ filterButtonText }}
+          {{ $t('contribution.filterMasonryGrid.myFriends') }}
         </ds-button>
 
         <div
+          id="my-filter"
           style="background-color: white; box-shadow: rgb(189 189 189) 1px 9px 15px 1px"
           v-if="showFilter"
         >
-          <filter-menu-component :showMobileMenu="showMobileMenu" />
+          <filter-menu-component :showMobileMenu="showMobileMenu"/>
         </div>
       </ds-grid-item>
       <ds-space :margin-bottom="{ base: 'small', md: 'base', lg: 'large' }" />
@@ -140,10 +153,6 @@ export default {
       }
       return 'filter'
     },
-    filterButtonText() {
-      if (this.postsFilter.author) return 'Beiträge von Freunden filtern'
-      return 'Beiträge filtern'
-    },
     finalFilters() {
       let filter = this.postsFilter
       if (this.hashtag) {
@@ -167,14 +176,21 @@ export default {
       this.resetCategories()
       this.toggleCategory(this.categoryId)
     }
+     document.addEventListener('click', this.removeFilter)
   },
   methods: {
     ...mapMutations({
       resetCategories: 'posts/RESET_CATEGORIES',
       toggleCategory: 'posts/TOGGLE_CATEGORY',
     }),
-    removeFilter() {
-      alert('Filter löschen')
+    removeFilter(e) {  
+      if (!e.target.closest('#my-filter') && !e.target.closest('.my-filter-button')) {
+        if (!this.showFilter) return 
+        this.showFilter = false          
+      }     
+    },
+    beforeDestroy() {
+       document.removeEventListener('click', this.removeFilter);
     },
     clearSearch() {
       this.$router.push({ path: '/' })