diff --git a/src/components/search/search.js b/src/components/search/search.js
index 5c1b8ce1..f24ad349 100644
--- a/src/components/search/search.js
+++ b/src/components/search/search.js
@@ -1,6 +1,5 @@
 import FollowCard from '../follow_card/follow_card.vue'
 import Conversation from '../conversation/conversation.vue'
-import Status from '../status/status.vue'
 import TabSwitcher from 'src/components/tab_switcher/tab_switcher.jsx'
 import SearchFilters from './search_filters.vue'
 import map from 'lodash/map'
@@ -20,7 +19,6 @@ const Search = {
   components: {
     FollowCard,
     Conversation,
-    Status,
     TabSwitcher,
     SearchFilters
   },
diff --git a/src/components/search/search.vue b/src/components/search/search.vue
index 23f2d0fc..99b86e3b 100644
--- a/src/components/search/search.vue
+++ b/src/components/search/search.vue
@@ -72,15 +72,12 @@
     </div>
     <div class="panel-body">
       <div v-if="currenResultTab === 'statuses'">
-        <Status
+        <Conversation
           v-for="status in visibleStatuses"
           :key="status.id"
-          :collapsable="false"
-          :expandable="false"
-          :compact="false"
-          class="search-result"
-          :statusoid="status"
-          :no-heading="false"
+          :collapsable="true"
+          class="status-fadein"
+          :status-id="status.id"
         />
         <button
           v-if="!loading && loadedInitially && lastStatusFetchCount > 0"
@@ -111,15 +108,12 @@
         </div>
       </div>
       <div v-if="currenResultTab === 'media'">
-        <Status
+        <Conversation
           v-for="media in visibleMedia"
           :key="media.id"
-          :collapsable="false"
-          :expandable="false"
-          :compact="false"
-          class="search-result"
-          :statusoid="media"
-          :no-heading="false"
+          :collapsable="true"
+          class="status-fadein"
+          :status-id="media.id"
         />
         <button
           v-if="!loading && loadedInitially && lastMediaFetchCount > 0"
@@ -224,13 +218,6 @@
   }
 }
 
-.search-result {
-  box-sizing: border-box;
-  border-bottom: 1px solid;
-  border-color: $fallback--border;
-  border-color: var(--border, $fallback--border);
-}
-
 .search-result-footer {
   border-width: 1px 0 0 0;
   border-style: solid;