diff --git a/webapp/locales/de.json b/webapp/locales/de.json
index 5586dc08c..2d138f65b 100644
--- a/webapp/locales/de.json
+++ b/webapp/locales/de.json
@@ -272,7 +272,9 @@
       "myFriends": "Nutzer denen ich folge",
       "myGroups": "Aus meinen Gruppen",
       "myTopics": "Meine Themen",
-      "noFilter": "Inhalt filtern"
+      "noFilter": "Inhalt filtern",
+      "onlyArticles": "Nur Beiträge",
+      "onlyEvents": "Nur Veranstaltungen"
     },
     "filterMyGroups": "Beiträge in meinen Gruppen",
     "inappropriatePicture": "Dieses Bild kann für einige Menschen unangemessen sein.",
diff --git a/webapp/locales/en.json b/webapp/locales/en.json
index 5d396e75f..b4cdd3cb6 100644
--- a/webapp/locales/en.json
+++ b/webapp/locales/en.json
@@ -272,7 +272,9 @@
       "myFriends": "Users I follow",
       "myGroups": "By my groups",
       "myTopics": "My topics",
-      "noFilter": "Filter content"
+      "noFilter": "Filter content",
+      "onlyArticles": "Only articles",
+      "onlyEvents": "Only events"
     },
     "filterMyGroups": "Contributions in my groups",
     "inappropriatePicture": "This image may be inappropriate for some people.",
diff --git a/webapp/pages/index.vue b/webapp/pages/index.vue
index f8a6b7c4b..63620c01a 100644
--- a/webapp/pages/index.vue
+++ b/webapp/pages/index.vue
@@ -25,6 +25,8 @@
             <base-button
               class="my-filter-button"
               v-if="
+                !articleSetInPostTypeFilter &&
+                !eventSetInPostTypeFilter &&
                 !postsFilter['categories_some'] &&
                 !postsFilter['author'] &&
                 !postsFilter['postsInMyGroups']
@@ -38,6 +40,22 @@
               <base-icon class="my-filter-button" :name="filterButtonIcon"></base-icon>
             </base-button>
 
+            <header-button
+              v-if="articleSetInPostTypeFilter"
+              :title="$t('contribution.filterMasonryGrid.onlyArticles')"
+              :clickButton="openFilterMenu"
+              :titleRemove="$t('filter-menu.deleteFilter')"
+              :clickRemove="unsetAllPostTypeFilters"
+            />
+
+            <header-button
+              v-if="eventSetInPostTypeFilter"
+              :title="$t('contribution.filterMasonryGrid.onlyEvents')"
+              :clickButton="openFilterMenu"
+              :titleRemove="$t('filter-menu.deleteFilter')"
+              :clickRemove="unsetAllPostTypeFilters"
+            />
+
             <header-button
               v-if="postsFilter['categories_some']"
               :title="$t('contribution.filterMasonryGrid.myTopics')"
@@ -120,6 +138,8 @@
 
 <script>
 import postListActions from '~/mixins/postListActions'
+import FilterMenuMixin from '~/mixins/filterMenuMixin.js'
+import mobile from '~/mixins/mobile'
 import DonationInfo from '~/components/DonationInfo/DonationInfo.vue'
 import HashtagsFilter from '~/components/HashtagsFilter/HashtagsFilter.vue'
 import HcEmpty from '~/components/Empty/Empty'
@@ -134,7 +154,6 @@ import UpdateQuery from '~/components/utils/UpdateQuery'
 import FilterMenuComponent from '~/components/FilterMenu/FilterMenuComponent'
 import { SHOW_CONTENT_FILTER_MASONRY_GRID } from '~/constants/filter.js'
 import { POST_ADD_BUTTON_POSITION_TOP } from '~/constants/posts.js'
-import mobile from '~/mixins/mobile'
 
 export default {
   components: {
@@ -147,7 +166,7 @@ export default {
     FilterMenuComponent,
     HeaderButton,
   },
-  mixins: [postListActions, mobile()],
+  mixins: [postListActions, FilterMenuMixin, mobile()],
   data() {
     const { hashtag = null } = this.$route.query
     return {
@@ -172,13 +191,9 @@ export default {
   computed: {
     ...mapGetters({
       postsFilter: 'posts/filter',
-      orderBy: 'posts/orderBy',
     }),
     filterButtonIcon() {
-      if (Object.keys(this.postsFilter).length === 0) {
-        return this.showFilter ? 'angle-up' : 'angle-down'
-      }
-      return 'close'
+      return this.showFilter ? 'angle-up' : 'angle-down'
     },
     finalFilters() {
       let filter = this.postsFilter