diff --git a/app/assets/javascripts/discourse/app/components/search-result-entry.hbs b/app/assets/javascripts/discourse/app/components/search-result-entry.hbs
index 735d72f6541..af53b82109d 100644
--- a/app/assets/javascripts/discourse/app/components/search-result-entry.hbs
+++ b/app/assets/javascripts/discourse/app/components/search-result-entry.hbs
@@ -1,11 +1,18 @@
-<div class="author">
-  <a href={{this.post.userPath}} data-user-card={{this.post.username}}>
-    {{avatar this.post imageSize="large"}}
-  </a>
-</div>
+<PluginOutlet
+  @name="search-results-topic-avatar-wrapper"
+  @outletArgs={{hash post=this.post}}
+>
+  <div class="author">
+    <a href={{this.post.userPath}} data-user-card={{this.post.username}}>
+      {{avatar this.post imageSize="large"}}
+    </a>
+  </div>
+
+</PluginOutlet>
 
 <div class="fps-topic" data-topic-id={{this.post.topic.id}}>
   <div class="topic">
+
     {{#if this.bulkSelectEnabled}}
       <TrackSelected
         @selectedList={{this.selected}}
@@ -55,33 +62,43 @@
     </div>
   </div>
 
-  <div class="blurb container">
-    <span class="date">
-      {{format-date this.post.created_at format="tiny"}}
-      {{#if this.post.blurb}}
-        <span class="separator">-</span>
-      {{/if}}
-    </span>
-
-    {{#if this.post.blurb}}
-      {{#if this.siteSettings.use_pg_headlines_for_excerpt}}
-        {{html-safe this.post.blurb}}
-      {{else}}
-        <HighlightSearch @highlight={{this.highlightQuery}}>
-          {{html-safe this.post.blurb}}
-        </HighlightSearch>
-      {{/if}}
-    {{/if}}
-  </div>
-
-  {{#if this.showLikeCount}}
-    {{#if this.post.like_count}}
-      <span class="like-count">
-        <span class="value">{{this.post.like_count}}</span>
-        {{d-icon "heart"}}
+  <PluginOutlet
+    @name="search-result-entry-blurb-wrapper"
+    @outletArgs={{hash post=this.post logClick=this.logClick}}
+  >
+    <div class="blurb container">
+      <span class="date">
+        {{format-date this.post.created_at format="tiny"}}
+        {{#if this.post.blurb}}
+          <span class="separator">-</span>
+        {{/if}}
       </span>
+
+      {{#if this.post.blurb}}
+        {{#if this.siteSettings.use_pg_headlines_for_excerpt}}
+          {{html-safe this.post.blurb}}
+        {{else}}
+          <HighlightSearch @highlight={{this.highlightQuery}}>
+            {{html-safe this.post.blurb}}
+          </HighlightSearch>
+        {{/if}}
+      {{/if}}
+    </div>
+  </PluginOutlet>
+
+  <PluginOutlet
+    @name="search-result-entry-stats-wrapper"
+    @outletArgs={{hash post=this.post}}
+  >
+    {{#if this.showLikeCount}}
+      {{#if this.post.like_count}}
+        <span class="like-count">
+          <span class="value">{{this.post.like_count}}</span>
+          {{d-icon "heart"}}
+        </span>
+      {{/if}}
     {{/if}}
-  {{/if}}
+  </PluginOutlet>
 </div>
 
 <PluginOutlet @name="after-search-result-entry" />
\ No newline at end of file
diff --git a/app/assets/javascripts/discourse/app/templates/user/activity.hbs b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
index dcb66a54e34..ae2375d1643 100644
--- a/app/assets/javascripts/discourse/app/templates/user/activity.hbs
+++ b/app/assets/javascripts/discourse/app/templates/user/activity.hbs
@@ -1,95 +1,95 @@
 {{body-class "user-activity-page"}}
-
-<div class="user-navigation user-navigation-secondary">
-  <HorizontalOverflowNav @ariaLabel="User secondary - activity">
-    <DNavigationItem
-      @route="userActivity.index"
-      @ariaCurrentContext="subNav"
-      class="user-nav__activity-all"
-    >
-      {{d-icon "bars-staggered"}}
-      <span>{{i18n "user.filters.all"}}</span>
-    </DNavigationItem>
-
-    <DNavigationItem
-      @route="userActivity.topics"
-      @ariaCurrentContext="subNav"
-      class="user-nav__activity-topics"
-    >
-      {{d-icon "list-ul"}}
-      <span>{{i18n "user_action_groups.4"}}</span>
-    </DNavigationItem>
-    <DNavigationItem
-      @route="userActivity.replies"
-      @ariaCurrentContext="subNav"
-      class="user-nav__activity-replies"
-    >
-      {{d-icon "reply"}}
-      <span>{{i18n "user_action_groups.5"}}</span>
-    </DNavigationItem>
-
-    {{#if this.user.showRead}}
+<PluginOutlet @name="user-activity-navigation-wrapper">
+  <div class="user-navigation user-navigation-secondary">
+    <HorizontalOverflowNav @ariaLabel="User secondary - activity">
       <DNavigationItem
-        @route="userActivity.read"
+        @route="userActivity.index"
         @ariaCurrentContext="subNav"
-        class="user-nav__activity-read"
-        title={{i18n "user.read_help"}}
+        class="user-nav__activity-all"
       >
-        {{d-icon "clock-rotate-left"}}
-        <span>{{i18n "user.read"}}</span>
+        {{d-icon "bars-staggered"}}
+        <span>{{i18n "user.filters.all"}}</span>
       </DNavigationItem>
-    {{/if}}
 
-    {{#if this.user.showDrafts}}
       <DNavigationItem
-        @route="userActivity.drafts"
+        @route="userActivity.topics"
         @ariaCurrentContext="subNav"
-        class="user-nav__activity-drafts"
+        class="user-nav__activity-topics"
       >
-        {{d-icon "pencil"}}
-        <span>{{this.draftLabel}}</span>
+        {{d-icon "list-ul"}}
+        <span>{{i18n "user_action_groups.4"}}</span>
       </DNavigationItem>
-    {{/if}}
-
-    {{#if (gt this.model.pending_posts_count 0)}}
       <DNavigationItem
-        @route="userActivity.pending"
+        @route="userActivity.replies"
         @ariaCurrentContext="subNav"
-        class="user-nav__activity-pending"
+        class="user-nav__activity-replies"
       >
-        {{d-icon "clock"}}
-        <span>{{this.pendingLabel}}</span>
+        {{d-icon "reply"}}
+        <span>{{i18n "user_action_groups.5"}}</span>
       </DNavigationItem>
-    {{/if}}
 
-    <DNavigationItem
-      @route="userActivity.likesGiven"
-      @ariaCurrentContext="subNav"
-      class="user-nav__activity-likes"
-    >
-      {{d-icon "heart"}}
-      <span>{{i18n "user_action_groups.1"}}</span>
-    </DNavigationItem>
+      {{#if this.user.showRead}}
+        <DNavigationItem
+          @route="userActivity.read"
+          @ariaCurrentContext="subNav"
+          class="user-nav__activity-read"
+          title={{i18n "user.read_help"}}
+        >
+          {{d-icon "clock-rotate-left"}}
+          <span>{{i18n "user.read"}}</span>
+        </DNavigationItem>
+      {{/if}}
+
+      {{#if this.user.showDrafts}}
+        <DNavigationItem
+          @route="userActivity.drafts"
+          @ariaCurrentContext="subNav"
+          class="user-nav__activity-drafts"
+        >
+          {{d-icon "pencil"}}
+          <span>{{this.draftLabel}}</span>
+        </DNavigationItem>
+      {{/if}}
+
+      {{#if (gt this.model.pending_posts_count 0)}}
+        <DNavigationItem
+          @route="userActivity.pending"
+          @ariaCurrentContext="subNav"
+          class="user-nav__activity-pending"
+        >
+          {{d-icon "clock"}}
+          <span>{{this.pendingLabel}}</span>
+        </DNavigationItem>
+      {{/if}}
 
-    {{#if this.user.showBookmarks}}
       <DNavigationItem
-        @route="userActivity.bookmarks"
+        @route="userActivity.likesGiven"
         @ariaCurrentContext="subNav"
-        class="user-nav__activity-bookmarks"
+        class="user-nav__activity-likes"
       >
-        {{d-icon "bookmark"}}
-        <span>{{i18n "user_action_groups.3"}}</span>
+        {{d-icon "heart"}}
+        <span>{{i18n "user_action_groups.1"}}</span>
       </DNavigationItem>
-    {{/if}}
 
-    <PluginOutlet
-      @name="user-activity-bottom"
-      @connectorTagName="li"
-      @outletArgs={{hash model=this.model}}
-    />
-  </HorizontalOverflowNav>
-</div>
+      {{#if this.user.showBookmarks}}
+        <DNavigationItem
+          @route="userActivity.bookmarks"
+          @ariaCurrentContext="subNav"
+          class="user-nav__activity-bookmarks"
+        >
+          {{d-icon "bookmark"}}
+          <span>{{i18n "user_action_groups.3"}}</span>
+        </DNavigationItem>
+      {{/if}}
 
+      <PluginOutlet
+        @name="user-activity-bottom"
+        @connectorTagName="li"
+        @outletArgs={{hash model=this.model}}
+      />
+    </HorizontalOverflowNav>
+  </div>
+</PluginOutlet>
 <section class="user-content" id="user-content">
   {{outlet}}
 </section>
\ No newline at end of file