diff --git a/webapp/assets/_new/styles/resets.scss b/webapp/assets/_new/styles/resets.scss
index 144f22d10..4e8b0a952 100644
--- a/webapp/assets/_new/styles/resets.scss
+++ b/webapp/assets/_new/styles/resets.scss
@@ -19,3 +19,10 @@ h6,
 p {
   margin: 0;
 }
+
+ol,
+ul {
+  list-style-type: none;
+  margin: 0;
+  padding: 0;
+}
diff --git a/webapp/components/_new/generic/TabNavigation/TabNavigation.vue b/webapp/components/_new/generic/TabNavigation/TabNavigation.vue
new file mode 100644
index 000000000..c20a53dba
--- /dev/null
+++ b/webapp/components/_new/generic/TabNavigation/TabNavigation.vue
@@ -0,0 +1,20 @@
+<template>
+  <ul class="tabs">
+    <li v-for="tab in tabs" :key="tab.type" class="tab">
+      <button @click="$emit('openTab', tab.type)">
+        {{ tab.title }}
+      </button>
+    </li>
+  </ul>
+</template>
+
+<script>
+export default {
+  props: {
+    tabs: {
+      type: Array,
+      required: true,
+    }
+  },
+}
+</script>
diff --git a/webapp/pages/search/search-results.vue b/webapp/pages/search/search-results.vue
index e72285207..388890d73 100644
--- a/webapp/pages/search/search-results.vue
+++ b/webapp/pages/search/search-results.vue
@@ -1,111 +1,30 @@
 <template>
-  <ds-container>
-       <base-button
-        class="crop-cancel"
-        icon="close"
-        size="small"
-        circle
-        danger
-        filled
-        rigth
-       @click="closeSearch"
-      />
-    <ds-section>
-     
-      <ds-heading>  <ds-tag color="primary" size="x-large" round>{{ searchResults.length }}</ds-tag>
-          Results for:
-          <b>{{ value }}</b></ds-heading>
-      <ds-text>    <ds-button
-            @click="postOnly = !postOnly"
-            :secondary="postOnly"
-            size="x-large"
-            align="right"
-          >
-            <ds-tag color="primary" size="x-large" round>{{ posts.length }}</ds-tag>
-            Beiträge
-          </ds-button>
-          <ds-button
-            @click="userOnly = !userOnly"
-            :secondary="userOnly"
-            size="x-large"
-            align="right"
-          >
-            <ds-tag color="primary" size="x-large" round>{{ users.length }}</ds-tag>
-            User
-          </ds-button></ds-text>
-    </ds-section>
-  <ds-space />
-    <ds-space />
-      <ds-section>
-   
-      
-    <ds-text size="x-large" v-show="userOnly">Menschen</ds-text>
-    <ds-space v-if="users.length === 0">no Result</ds-space>
-    <ds-grid v-else gap="x-small" v-show="userOnly">
-      <ds-grid-item v-for="users in users" :key="users.key" class="User searchresults">
-       
-          <ds-placeholder>
-            <ds-avatar size="large" :title="users.name" :image="users.avatar" />
-            {{ users.name }}
-            <div>
-              <ds-chip>Beiträge</ds-chip>
-              <ds-chip>Kommentare</ds-chip>
-            </div>
-          </ds-placeholder>
-       
-      </ds-grid-item>
-    </ds-grid>
-      </ds-section>
-     
-   <ds-space />
-    <ds-space />
-
-      <ds-section>
-     
-      <ds-text size="x-large" v-show="postOnly">Beiträge</ds-text>
-      <ds-space v-if="posts.length === 0">no Result</ds-space>
-      <ds-list v-else ordered v-show="postOnly">
-        <ds-list-item v-for="posts in posts" :key="posts.key" class="Post searchresults">
-          <div>
-            <b>{{ posts.title }}</b>
-            <div v-html="posts.content"></div>
-            <div>
-              <ds-text size="small">
-                <i>
-                  {{ posts.author.name }}-
-                  <hc-relative-date-time :date-time="posts.createdAt" />
-                </i>
-              </ds-text>
-            </div>
-            <div>
-              <div class="categories">
-                <ds-space margin="xx-small" />
-                <hc-category
-                  v-for="category in posts.categories"
-                  :key="category.id"
-                  :icon="category.icon"
-                  :name="$t(`contribution.category.name.${category.slug}`)"
-                />
-                <ds-tag v-if="posts.language" class="category-tag language">
-                  <base-icon name="globe" />
-                  {{ posts.language.toUpperCase() }}
-                </ds-tag>
-              </div>
-            </div>
-          </div>
-        </ds-list-item>
-      </ds-list>
-     
-      </ds-section>
-     
-  </ds-container>
+  <div class="search-results">
+    <!-- <filter-menu :hashtag="value" @clearSearch="closeSearch" /> -->
+    <tab-navigation
+      :tabs="tabOptions"
+      @openTab="value => showActive = value"
+    />
+    <section>
+      <ul v-if="activeResources.length">
+        <li v-for="resource in activeResources" :key="resource.key">
+          <post-teaser v-if="showActive === 'posts'" :post="resource" />
+          <base-card v-else-if="showActive === 'users'" :wideContent="true">
+            <user-teaser :user="resource" />
+          </base-card>
+        </li>
+      </ul>
+    </section>
+  </div>
 </template>
 
 <script>
 import { mapGetters } from 'vuex'
 import { findResourcesQuery } from '~/graphql/Search.js'
-import HcRelativeDateTime from '~/components/RelativeDateTime'
-import HcCategory from '~/components/Category'
+import FilterMenu from '~/components/FilterMenu/FilterMenu'
+import TabNavigation from '~/components/_new/generic/TabNavigation/TabNavigation'
+import PostTeaser from '~/components/PostTeaser/PostTeaser'
+import UserTeaser from '~/components/UserTeaser/UserTeaser'
 
 export default {
   layout: 'default',
@@ -115,8 +34,10 @@ export default {
     }
   },
   components: {
-    HcRelativeDateTime,
-    HcCategory,
+    FilterMenu,
+    TabNavigation,
+    PostTeaser,
+    UserTeaser,
   },
   data() {
     return {
@@ -124,8 +45,7 @@ export default {
       value: '',
       pending: false,
       searchResults: [],
-      userOnly: true,
-      postOnly: true,
+      showActive: 'posts',
     }
   },
   computed: {
@@ -140,6 +60,16 @@ export default {
     users() {
       return this.searchResults.filter(result => result.__typename === 'User')
     },
+    activeResources() {
+      if (this.showActive === 'posts') return this.posts
+      else if (this.showActive === 'users') return this.users
+    },
+    tabOptions() {
+      return [
+        { type: 'posts', title: `${this.posts.length} Posts` },
+        { type: 'users', title: `${this.users.length} Users` },
+      ]
+    },
   },
   mounted() {
     if (this.$route.query.item){
@@ -183,4 +113,3 @@ export default {
   },
 }
 </script>
- 
\ No newline at end of file