diff --git a/webapp/src/components/__snapshots__/cardDialog.test.tsx.snap b/webapp/src/components/__snapshots__/cardDialog.test.tsx.snap
index defa8ebfd96..d5741064646 100644
--- a/webapp/src/components/__snapshots__/cardDialog.test.tsx.snap
+++ b/webapp/src/components/__snapshots__/cardDialog.test.tsx.snap
@@ -41,13 +41,6 @@ exports[`components/cardDialog already following card 1`] = `
                   Attach
                 </span>
               </button>
-              <button
-                type="button"
-              >
-                <span>
-                  Following
-                </span>
-              </button>
             </div>
             <div
               aria-label="menuwrapper"
@@ -499,13 +492,6 @@ exports[`components/cardDialog return a cardDialog readonly 1`] = `
                   Attach
                 </span>
               </button>
-              <button
-                type="button"
-              >
-                <span>
-                  Follow
-                </span>
-              </button>
             </div>
             <button
               aria-label="Close dialog"
@@ -630,13 +616,6 @@ exports[`components/cardDialog return cardDialog menu content 1`] = `
                   Attach
                 </span>
               </button>
-              <button
-                type="button"
-              >
-                <span>
-                  Follow
-                </span>
-              </button>
             </div>
             <div
               aria-label="menuwrapper"
@@ -979,13 +958,6 @@ exports[`components/cardDialog return cardDialog menu content and cancel delete
                   Attach
                 </span>
               </button>
-              <button
-                type="button"
-              >
-                <span>
-                  Follow
-                </span>
-              </button>
             </div>
             <div
               aria-label="menuwrapper"
@@ -1191,13 +1163,6 @@ exports[`components/cardDialog should match snapshot 1`] = `
                   Attach
                 </span>
               </button>
-              <button
-                type="button"
-              >
-                <span>
-                  Follow
-                </span>
-              </button>
             </div>
             <div
               aria-label="menuwrapper"
@@ -1392,15 +1357,7 @@ exports[`components/cardDialog should match snapshot without permissions 1`] = `
           >
             <div
               class="d-flex"
-            >
-              <button
-                type="button"
-              >
-                <span>
-                  Follow
-                </span>
-              </button>
-            </div>
+            />
             <div
               aria-label="menuwrapper"
               class="MenuWrapper"
diff --git a/webapp/src/components/__snapshots__/centerPanel.test.tsx.snap b/webapp/src/components/__snapshots__/centerPanel.test.tsx.snap
index 96d6ec14747..36ccb76d2b2 100644
--- a/webapp/src/components/__snapshots__/centerPanel.test.tsx.snap
+++ b/webapp/src/components/__snapshots__/centerPanel.test.tsx.snap
@@ -1167,13 +1167,13 @@ exports[`components/centerPanel return centerPanel and click on card to show car
           class="octo-board-column"
         >
           <div
-            class="KanbanCard false"
+            class="KanbanCard"
             draggable="true"
             style="opacity: 1;"
           >
             <div
               aria-label="menuwrapper"
-              class="MenuWrapper optionsMenu "
+              class="MenuWrapper optionsMenu"
               role="button"
             >
               <button
@@ -1201,13 +1201,13 @@ exports[`components/centerPanel return centerPanel and click on card to show car
             </div>
           </div>
           <div
-            class="KanbanCard false"
+            class="KanbanCard"
             draggable="true"
             style="opacity: 1;"
           >
             <div
               aria-label="menuwrapper"
-              class="MenuWrapper optionsMenu "
+              class="MenuWrapper optionsMenu"
               role="button"
             >
               <button
@@ -8974,13 +8974,13 @@ exports[`components/centerPanel should match snapshot for Kanban 1`] = `
           class="octo-board-column"
         >
           <div
-            class="KanbanCard false"
+            class="KanbanCard"
             draggable="true"
             style="opacity: 1;"
           >
             <div
               aria-label="menuwrapper"
-              class="MenuWrapper optionsMenu "
+              class="MenuWrapper optionsMenu"
               role="button"
             >
               <button
@@ -9493,13 +9493,13 @@ exports[`components/centerPanel should match snapshot for Kanban, not shared 1`]
           class="octo-board-column"
         >
           <div
-            class="KanbanCard false"
+            class="KanbanCard"
             draggable="true"
             style="opacity: 1;"
           >
             <div
               aria-label="menuwrapper"
-              class="MenuWrapper optionsMenu "
+              class="MenuWrapper optionsMenu"
               role="button"
             >
               <button
diff --git a/webapp/src/components/__snapshots__/topBar.test.tsx.snap b/webapp/src/components/__snapshots__/topBar.test.tsx.snap
index a36c70b4fe9..e66d67d1358 100644
--- a/webapp/src/components/__snapshots__/topBar.test.tsx.snap
+++ b/webapp/src/components/__snapshots__/topBar.test.tsx.snap
@@ -7,22 +7,21 @@ exports[`src/components/topBar should match snapshot for focalboardPlugin 1`] =
   >
     <a
       class="link"
-      href="https://www.focalboard.com/fwlink/feedback-boards.html?v=1.0.0"
+      href="https://www.focalboard.com/fwlink/feedback-focalboard.html?v=1.0.0"
       rel="noreferrer"
       target="_blank"
     >
       Give feedback
     </a>
-    <div
-      class="versionFrame"
+    <a
+      href="https://www.focalboard.com/guide/user?utm_source=webapp"
+      rel="noreferrer"
+      target="_blank"
     >
-      <div
-        class="version"
-        title="v1.0.0"
-      >
-        v1.0.0
-      </div>
-    </div>
+      <i
+        class="CompassIcon icon-help-circle-outline HelpIcon"
+      />
+    </a>
   </div>
 </div>
 `;
diff --git a/webapp/src/components/__snapshots__/workspace.test.tsx.snap b/webapp/src/components/__snapshots__/workspace.test.tsx.snap
index e371fc960c0..61a8131a65d 100644
--- a/webapp/src/components/__snapshots__/workspace.test.tsx.snap
+++ b/webapp/src/components/__snapshots__/workspace.test.tsx.snap
@@ -637,13 +637,13 @@ exports[`src/components/workspace return workspace and showcard 1`] = `
               class="octo-board-column"
             >
               <div
-                class="KanbanCard false"
+                class="KanbanCard"
                 draggable="true"
                 style="opacity: 1;"
               >
                 <div
                   aria-label="menuwrapper"
-                  class="MenuWrapper optionsMenu "
+                  class="MenuWrapper optionsMenu"
                   role="button"
                 >
                   <button
@@ -680,13 +680,13 @@ exports[`src/components/workspace return workspace and showcard 1`] = `
                 </div>
               </div>
               <div
-                class="KanbanCard false"
+                class="KanbanCard"
                 draggable="true"
                 style="opacity: 1;"
               >
                 <div
                   aria-label="menuwrapper"
-                  class="MenuWrapper optionsMenu "
+                  class="MenuWrapper optionsMenu"
                   role="button"
                 >
                   <button
@@ -723,13 +723,13 @@ exports[`src/components/workspace return workspace and showcard 1`] = `
                 </div>
               </div>
               <div
-                class="KanbanCard false"
+                class="KanbanCard"
                 draggable="true"
                 style="opacity: 1;"
               >
                 <div
                   aria-label="menuwrapper"
-                  class="MenuWrapper optionsMenu "
+                  class="MenuWrapper optionsMenu"
                   role="button"
                 >
                   <button
@@ -998,7 +998,7 @@ exports[`src/components/workspace return workspace readonly and showcard 1`] = `
               class="octo-board-column"
             >
               <div
-                class="KanbanCard false"
+                class="KanbanCard"
                 draggable="false"
                 style="opacity: 1;"
               >
@@ -1028,7 +1028,7 @@ exports[`src/components/workspace return workspace readonly and showcard 1`] = `
                 </div>
               </div>
               <div
-                class="KanbanCard false"
+                class="KanbanCard"
                 draggable="false"
                 style="opacity: 1;"
               >
@@ -1058,7 +1058,7 @@ exports[`src/components/workspace return workspace readonly and showcard 1`] = `
                 </div>
               </div>
               <div
-                class="KanbanCard false"
+                class="KanbanCard"
                 draggable="false"
                 style="opacity: 1;"
               >
@@ -1748,13 +1748,13 @@ exports[`src/components/workspace should match snapshot 1`] = `
               class="octo-board-column"
             >
               <div
-                class="KanbanCard false"
+                class="KanbanCard"
                 draggable="true"
                 style="opacity: 1;"
               >
                 <div
                   aria-label="menuwrapper"
-                  class="MenuWrapper optionsMenu "
+                  class="MenuWrapper optionsMenu"
                   role="button"
                 >
                   <button
@@ -1791,13 +1791,13 @@ exports[`src/components/workspace should match snapshot 1`] = `
                 </div>
               </div>
               <div
-                class="KanbanCard false"
+                class="KanbanCard"
                 draggable="true"
                 style="opacity: 1;"
               >
                 <div
                   aria-label="menuwrapper"
-                  class="MenuWrapper optionsMenu "
+                  class="MenuWrapper optionsMenu"
                   role="button"
                 >
                   <button
@@ -1834,13 +1834,13 @@ exports[`src/components/workspace should match snapshot 1`] = `
                 </div>
               </div>
               <div
-                class="KanbanCard false"
+                class="KanbanCard"
                 draggable="true"
                 style="opacity: 1;"
               >
                 <div
                   aria-label="menuwrapper"
-                  class="MenuWrapper optionsMenu "
+                  class="MenuWrapper optionsMenu"
                   role="button"
                 >
                   <button
@@ -2109,7 +2109,7 @@ exports[`src/components/workspace should match snapshot with readonly 1`] = `
               class="octo-board-column"
             >
               <div
-                class="KanbanCard false"
+                class="KanbanCard"
                 draggable="false"
                 style="opacity: 1;"
               >
@@ -2139,7 +2139,7 @@ exports[`src/components/workspace should match snapshot with readonly 1`] = `
                 </div>
               </div>
               <div
-                class="KanbanCard false"
+                class="KanbanCard"
                 draggable="false"
                 style="opacity: 1;"
               >
@@ -2169,7 +2169,7 @@ exports[`src/components/workspace should match snapshot with readonly 1`] = `
                 </div>
               </div>
               <div
-                class="KanbanCard false"
+                class="KanbanCard"
                 draggable="false"
                 style="opacity: 1;"
               >
diff --git a/webapp/src/components/boardTemplateSelector/__snapshots__/boardTemplateSelectorPreview.test.tsx.snap b/webapp/src/components/boardTemplateSelector/__snapshots__/boardTemplateSelectorPreview.test.tsx.snap
index d51bab53bd6..57a4b1f27aa 100644
--- a/webapp/src/components/boardTemplateSelector/__snapshots__/boardTemplateSelectorPreview.test.tsx.snap
+++ b/webapp/src/components/boardTemplateSelector/__snapshots__/boardTemplateSelectorPreview.test.tsx.snap
@@ -360,13 +360,13 @@ exports[`components/boardTemplateSelector/boardTemplateSelectorPreview should ma
           class="octo-board-column"
         >
           <div
-            class="KanbanCard false"
+            class="KanbanCard"
             draggable="true"
             style="opacity: 1;"
           >
             <div
               aria-label="menuwrapper"
-              class="MenuWrapper optionsMenu "
+              class="MenuWrapper optionsMenu"
               role="button"
             >
               <button
diff --git a/webapp/src/components/cardDetail/__snapshots__/cardDetail.test.tsx.snap b/webapp/src/components/cardDetail/__snapshots__/cardDetail.test.tsx.snap
index 10113eaad4c..dc1549c19df 100644
--- a/webapp/src/components/cardDetail/__snapshots__/cardDetail.test.tsx.snap
+++ b/webapp/src/components/cardDetail/__snapshots__/cardDetail.test.tsx.snap
@@ -239,7 +239,7 @@ exports[`components/cardDetail/CardDetail should show add comments tour tip 1`]
         >
           <img
             alt="tutorial tour tip product image"
-            src="test-file-stub"
+            src="http://localhost/test-file-stub"
           />
         </div>
         <div
@@ -364,7 +364,7 @@ exports[`components/cardDetail/CardDetail should show add description tour tip 1
         >
           <img
             alt="tutorial tour tip product image"
-            src="test-file-stub"
+            src="http://localhost/test-file-stub"
           />
         </div>
         <div
@@ -487,7 +487,7 @@ exports[`components/cardDetail/CardDetail should show add properties tour tip 1`
         >
           <img
             alt="tutorial tour tip product image"
-            src="test-file-stub"
+            src="http://localhost/test-file-stub"
           />
         </div>
         <div
diff --git a/webapp/src/components/kanban/__snapshots__/kanban.test.tsx.snap b/webapp/src/components/kanban/__snapshots__/kanban.test.tsx.snap
index 63d0817f09e..b1df8786d1d 100644
--- a/webapp/src/components/kanban/__snapshots__/kanban.test.tsx.snap
+++ b/webapp/src/components/kanban/__snapshots__/kanban.test.tsx.snap
@@ -144,13 +144,13 @@ exports[`src/component/kanban/kanban return kanban and change title on KanbanCol
         class="octo-board-column"
       >
         <div
-          class="KanbanCard false"
+          class="KanbanCard"
           draggable="true"
           style="opacity: 1;"
         >
           <div
             aria-label="menuwrapper"
-            class="MenuWrapper optionsMenu "
+            class="MenuWrapper optionsMenu"
             role="button"
           >
             <button
@@ -177,13 +177,13 @@ exports[`src/component/kanban/kanban return kanban and change title on KanbanCol
           </div>
         </div>
         <div
-          class="KanbanCard false"
+          class="KanbanCard"
           draggable="true"
           style="opacity: 1;"
         >
           <div
             aria-label="menuwrapper"
-            class="MenuWrapper optionsMenu "
+            class="MenuWrapper optionsMenu"
             role="button"
           >
             <button
@@ -221,13 +221,13 @@ exports[`src/component/kanban/kanban return kanban and change title on KanbanCol
         class="octo-board-column"
       >
         <div
-          class="KanbanCard false"
+          class="KanbanCard"
           draggable="true"
           style="opacity: 1;"
         >
           <div
             aria-label="menuwrapper"
-            class="MenuWrapper optionsMenu "
+            class="MenuWrapper optionsMenu"
             role="button"
           >
             <button
@@ -594,13 +594,13 @@ exports[`src/component/kanban/kanban return kanban and click on KanbanCalculatio
         class="octo-board-column"
       >
         <div
-          class="KanbanCard false"
+          class="KanbanCard"
           draggable="true"
           style="opacity: 1;"
         >
           <div
             aria-label="menuwrapper"
-            class="MenuWrapper optionsMenu "
+            class="MenuWrapper optionsMenu"
             role="button"
           >
             <button
@@ -627,13 +627,13 @@ exports[`src/component/kanban/kanban return kanban and click on KanbanCalculatio
           </div>
         </div>
         <div
-          class="KanbanCard false"
+          class="KanbanCard"
           draggable="true"
           style="opacity: 1;"
         >
           <div
             aria-label="menuwrapper"
-            class="MenuWrapper optionsMenu "
+            class="MenuWrapper optionsMenu"
             role="button"
           >
             <button
@@ -671,13 +671,13 @@ exports[`src/component/kanban/kanban return kanban and click on KanbanCalculatio
         class="octo-board-column"
       >
         <div
-          class="KanbanCard false"
+          class="KanbanCard"
           draggable="true"
           style="opacity: 1;"
         >
           <div
             aria-label="menuwrapper"
-            class="MenuWrapper optionsMenu "
+            class="MenuWrapper optionsMenu"
             role="button"
           >
             <button
@@ -880,13 +880,13 @@ exports[`src/component/kanban/kanban should match snapshot 1`] = `
         class="octo-board-column"
       >
         <div
-          class="KanbanCard false"
+          class="KanbanCard"
           draggable="true"
           style="opacity: 1;"
         >
           <div
             aria-label="menuwrapper"
-            class="MenuWrapper optionsMenu "
+            class="MenuWrapper optionsMenu"
             role="button"
           >
             <button
@@ -913,13 +913,13 @@ exports[`src/component/kanban/kanban should match snapshot 1`] = `
           </div>
         </div>
         <div
-          class="KanbanCard false"
+          class="KanbanCard"
           draggable="true"
           style="opacity: 1;"
         >
           <div
             aria-label="menuwrapper"
-            class="MenuWrapper optionsMenu "
+            class="MenuWrapper optionsMenu"
             role="button"
           >
             <button
@@ -957,13 +957,13 @@ exports[`src/component/kanban/kanban should match snapshot 1`] = `
         class="octo-board-column"
       >
         <div
-          class="KanbanCard false"
+          class="KanbanCard"
           draggable="true"
           style="opacity: 1;"
         >
           <div
             aria-label="menuwrapper"
-            class="MenuWrapper optionsMenu "
+            class="MenuWrapper optionsMenu"
             role="button"
           >
             <button
@@ -1117,13 +1117,13 @@ exports[`src/component/kanban/kanban should match snapshot without permissions 1
         class="octo-board-column"
       >
         <div
-          class="KanbanCard false"
+          class="KanbanCard"
           draggable="true"
           style="opacity: 1;"
         >
           <div
             aria-label="menuwrapper"
-            class="MenuWrapper optionsMenu "
+            class="MenuWrapper optionsMenu"
             role="button"
           >
             <button
@@ -1150,13 +1150,13 @@ exports[`src/component/kanban/kanban should match snapshot without permissions 1
           </div>
         </div>
         <div
-          class="KanbanCard false"
+          class="KanbanCard"
           draggable="true"
           style="opacity: 1;"
         >
           <div
             aria-label="menuwrapper"
-            class="MenuWrapper optionsMenu "
+            class="MenuWrapper optionsMenu"
             role="button"
           >
             <button
@@ -1187,13 +1187,13 @@ exports[`src/component/kanban/kanban should match snapshot without permissions 1
         class="octo-board-column"
       >
         <div
-          class="KanbanCard false"
+          class="KanbanCard"
           draggable="true"
           style="opacity: 1;"
         >
           <div
             aria-label="menuwrapper"
-            class="MenuWrapper optionsMenu "
+            class="MenuWrapper optionsMenu"
             role="button"
           >
             <button
diff --git a/webapp/src/components/kanban/__snapshots__/kanbanCard.test.tsx.snap b/webapp/src/components/kanban/__snapshots__/kanbanCard.test.tsx.snap
index f288a4aa993..c8cdb8ecb70 100644
--- a/webapp/src/components/kanban/__snapshots__/kanbanCard.test.tsx.snap
+++ b/webapp/src/components/kanban/__snapshots__/kanbanCard.test.tsx.snap
@@ -3,13 +3,13 @@
 exports[`src/components/kanban/kanbanCard return kanbanCard and click on copy link menu  1`] = `
 <div>
   <div
-    class="KanbanCard false"
+    class="KanbanCard"
     draggable="true"
     style="opacity: 1;"
   >
     <div
       aria-label="menuwrapper"
-      class="MenuWrapper override menuOpened optionsMenu "
+      class="MenuWrapper override menuOpened optionsMenu"
       role="button"
     >
       <button
@@ -185,13 +185,13 @@ exports[`src/components/kanban/kanbanCard return kanbanCard and click on copy li
 exports[`src/components/kanban/kanbanCard return kanbanCard and click on delete menu  1`] = `
 <div>
   <div
-    class="KanbanCard false"
+    class="KanbanCard"
     draggable="true"
     style="opacity: 1;"
   >
     <div
       aria-label="menuwrapper"
-      class="MenuWrapper override menuOpened optionsMenu "
+      class="MenuWrapper override menuOpened optionsMenu"
       role="button"
     >
       <button
@@ -367,13 +367,13 @@ exports[`src/components/kanban/kanbanCard return kanbanCard and click on delete
 exports[`src/components/kanban/kanbanCard return kanbanCard and click on duplicate menu  1`] = `
 <div>
   <div
-    class="KanbanCard false"
+    class="KanbanCard"
     draggable="true"
     style="opacity: 1;"
   >
     <div
       aria-label="menuwrapper"
-      class="MenuWrapper override menuOpened optionsMenu "
+      class="MenuWrapper override menuOpened optionsMenu"
       role="button"
     >
       <button
@@ -549,13 +549,13 @@ exports[`src/components/kanban/kanbanCard return kanbanCard and click on duplica
 exports[`src/components/kanban/kanbanCard should match snapshot 1`] = `
 <div>
   <div
-    class="KanbanCard false"
+    class="KanbanCard"
     draggable="true"
     style="opacity: 1;"
   >
     <div
       aria-label="menuwrapper"
-      class="MenuWrapper optionsMenu "
+      class="MenuWrapper optionsMenu"
       role="button"
     >
       <button
@@ -595,7 +595,7 @@ exports[`src/components/kanban/kanbanCard should match snapshot 1`] = `
 exports[`src/components/kanban/kanbanCard should match snapshot with readonly 1`] = `
 <div>
   <div
-    class="KanbanCard false"
+    class="KanbanCard"
     draggable="false"
     style="opacity: 1;"
   >
diff --git a/webapp/src/components/onboardingTour/addComments/__snapshots__/addComments.test.tsx.snap b/webapp/src/components/onboardingTour/addComments/__snapshots__/addComments.test.tsx.snap
index a675e0907e9..bfd0813a998 100644
--- a/webapp/src/components/onboardingTour/addComments/__snapshots__/addComments.test.tsx.snap
+++ b/webapp/src/components/onboardingTour/addComments/__snapshots__/addComments.test.tsx.snap
@@ -46,7 +46,7 @@ exports[`components/onboardingTour/addComments/AddCommentTourStep after hover 1`
         >
           <img
             alt="tutorial tour tip product image"
-            src="test-file-stub"
+            src="http://localhost/test-file-stub"
           />
         </div>
         <div
diff --git a/webapp/src/components/onboardingTour/addDescription/__snapshots__/addDescription.test.tsx.snap b/webapp/src/components/onboardingTour/addDescription/__snapshots__/addDescription.test.tsx.snap
index 68bd73c69ae..3c5ab84bedb 100644
--- a/webapp/src/components/onboardingTour/addDescription/__snapshots__/addDescription.test.tsx.snap
+++ b/webapp/src/components/onboardingTour/addDescription/__snapshots__/addDescription.test.tsx.snap
@@ -46,7 +46,7 @@ exports[`components/onboardingTour/addComments/AddDescriptionTourStep after hove
         >
           <img
             alt="tutorial tour tip product image"
-            src="test-file-stub"
+            src="http://localhost/test-file-stub"
           />
         </div>
         <div
diff --git a/webapp/src/components/onboardingTour/addProperties/__snapshots__/addProperties.test.tsx.snap b/webapp/src/components/onboardingTour/addProperties/__snapshots__/addProperties.test.tsx.snap
index 45ad425460f..c40bf59d506 100644
--- a/webapp/src/components/onboardingTour/addProperties/__snapshots__/addProperties.test.tsx.snap
+++ b/webapp/src/components/onboardingTour/addProperties/__snapshots__/addProperties.test.tsx.snap
@@ -46,7 +46,7 @@ exports[`components/onboardingTour/addComments/AddPropertiesTourStep after hover
         >
           <img
             alt="tutorial tour tip product image"
-            src="test-file-stub"
+            src="http://localhost/test-file-stub"
           />
         </div>
         <div
diff --git a/webapp/src/components/onboardingTour/addView/__snapshots__/addView.test.tsx.snap b/webapp/src/components/onboardingTour/addView/__snapshots__/addView.test.tsx.snap
index 9e7ab45b821..3d380b3a461 100644
--- a/webapp/src/components/onboardingTour/addView/__snapshots__/addView.test.tsx.snap
+++ b/webapp/src/components/onboardingTour/addView/__snapshots__/addView.test.tsx.snap
@@ -46,7 +46,7 @@ exports[`components/onboardingTour/addComments/AddViewTourStep after hover 1`] =
         >
           <img
             alt="tutorial tour tip product image"
-            src="test-file-stub"
+            src="http://localhost/test-file-stub"
           />
         </div>
         <div
diff --git a/webapp/src/components/onboardingTour/copyLink/__snapshots__/copyLink.test.tsx.snap b/webapp/src/components/onboardingTour/copyLink/__snapshots__/copyLink.test.tsx.snap
index edece51f53b..4255a28f948 100644
--- a/webapp/src/components/onboardingTour/copyLink/__snapshots__/copyLink.test.tsx.snap
+++ b/webapp/src/components/onboardingTour/copyLink/__snapshots__/copyLink.test.tsx.snap
@@ -46,7 +46,7 @@ exports[`components/onboardingTour/addComments/CopyLinkTourStep after hover 1`]
         >
           <img
             alt="tutorial tour tip product image"
-            src="test-file-stub"
+            src="http://localhost/test-file-stub"
           />
         </div>
         <div
diff --git a/webapp/src/components/onboardingTour/shareBoard/__snapshots__/shareBoard.test.tsx.snap b/webapp/src/components/onboardingTour/shareBoard/__snapshots__/shareBoard.test.tsx.snap
index 0f5655b6d97..91dc5421529 100644
--- a/webapp/src/components/onboardingTour/shareBoard/__snapshots__/shareBoard.test.tsx.snap
+++ b/webapp/src/components/onboardingTour/shareBoard/__snapshots__/shareBoard.test.tsx.snap
@@ -46,7 +46,7 @@ exports[`components/onboardingTour/addComments/ShareBoardTourStep after hover 1`
         >
           <img
             alt="tutorial tour tip product image"
-            src="test-file-stub"
+            src="http://localhost/test-file-stub"
           />
         </div>
         <div
diff --git a/webapp/src/components/shareBoard/__snapshots__/channelPermissionsRow.test.tsx.snap b/webapp/src/components/shareBoard/__snapshots__/channelPermissionsRow.test.tsx.snap
deleted file mode 100644
index ff6f02b2c01..00000000000
--- a/webapp/src/components/shareBoard/__snapshots__/channelPermissionsRow.test.tsx.snap
+++ /dev/null
@@ -1,445 +0,0 @@
-// Jest Snapshot v1, https://goo.gl/fbAQLP
-
-exports[`src/components/shareBoard/channelPermissionsRow should match snapshot 1`] = `
-<div>
-  <div
-    class="user-item channel-item"
-  >
-    <div
-      class="user-item__content"
-    >
-      <span
-        class="user-item__img"
-      >
-        <i
-          class="CompassIcon icon-globe GlobeIcon"
-        />
-      </span>
-      <div
-        class="ml-3"
-      >
-        <strong>
-          Test Channel
-        </strong>
-      </div>
-    </div>
-    <div>
-      <div
-        aria-label="menuwrapper"
-        class="MenuWrapper"
-        role="button"
-      >
-        <button
-          class="user-item__button"
-        >
-          Editor
-          <i
-            class="CompassIcon icon-chevron-down CompassIcon"
-          />
-        </button>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`src/components/shareBoard/channelPermissionsRow should match snapshot in plugin mode 1`] = `
-<div>
-  <div
-    class="user-item channel-item"
-  >
-    <div
-      class="user-item__content"
-    >
-      <span
-        class="user-item__img"
-      >
-        <i
-          class="CompassIcon icon-globe GlobeIcon"
-        />
-      </span>
-      <div
-        class="ml-3"
-      >
-        <strong>
-          Test Channel
-        </strong>
-      </div>
-    </div>
-    <div>
-      <div
-        aria-label="menuwrapper"
-        class="MenuWrapper override menuOpened"
-        role="button"
-      >
-        <button
-          class="user-item__button"
-        >
-          Editor
-          <i
-            class="CompassIcon icon-chevron-down CompassIcon"
-          />
-        </button>
-        <div
-          class="Menu noselect left "
-        >
-          <div
-            class="menu-contents"
-          >
-            <div
-              class="menu-options"
-            >
-              <div>
-                <div
-                  aria-label="Unlink"
-                  class="MenuOption TextOption menu-option"
-                  role="button"
-                >
-                  <div
-                    class="d-flex"
-                  >
-                    <div
-                      class="menu-option__icon"
-                    >
-                      <i
-                        class="CompassIcon icon-trash-can-outline DeleteIcon trash-can-outline"
-                      />
-                    </div>
-                  </div>
-                  <div
-                    class="menu-option__content"
-                  >
-                    <div
-                      class="menu-name"
-                    >
-                      Unlink
-                    </div>
-                  </div>
-                  <div
-                    class="noicon"
-                  />
-                </div>
-              </div>
-            </div>
-            <div
-              class="menu-spacer hideOnWidescreen"
-            />
-            <div
-              class="menu-options hideOnWidescreen"
-            >
-              <div
-                aria-label="Cancel"
-                class="MenuOption TextOption menu-option menu-cancel"
-                role="button"
-              >
-                <div
-                  class="d-flex"
-                >
-                  <div
-                    class="noicon"
-                  />
-                </div>
-                <div
-                  class="menu-option__content"
-                >
-                  <div
-                    class="menu-name"
-                  >
-                    Cancel
-                  </div>
-                </div>
-                <div
-                  class="noicon"
-                />
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`src/components/shareBoard/channelPermissionsRow should match snapshot in template 1`] = `
-<div>
-  <div
-    class="user-item channel-item"
-  >
-    <div
-      class="user-item__content"
-    >
-      <span
-        class="user-item__img"
-      >
-        <i
-          class="CompassIcon icon-globe GlobeIcon"
-        />
-      </span>
-      <div
-        class="ml-3"
-      >
-        <strong>
-          Test Channel
-        </strong>
-      </div>
-    </div>
-    <div>
-      <div
-        aria-label="menuwrapper"
-        class="MenuWrapper override menuOpened"
-        role="button"
-      >
-        <button
-          class="user-item__button"
-        >
-          Editor
-          <i
-            class="CompassIcon icon-chevron-down CompassIcon"
-          />
-        </button>
-        <div
-          class="Menu noselect left "
-        >
-          <div
-            class="menu-contents"
-          >
-            <div
-              class="menu-options"
-            >
-              <div>
-                <div
-                  aria-label="Unlink"
-                  class="MenuOption TextOption menu-option"
-                  role="button"
-                >
-                  <div
-                    class="d-flex"
-                  >
-                    <div
-                      class="menu-option__icon"
-                    >
-                      <i
-                        class="CompassIcon icon-trash-can-outline DeleteIcon trash-can-outline"
-                      />
-                    </div>
-                  </div>
-                  <div
-                    class="menu-option__content"
-                  >
-                    <div
-                      class="menu-name"
-                    >
-                      Unlink
-                    </div>
-                  </div>
-                  <div
-                    class="noicon"
-                  />
-                </div>
-              </div>
-            </div>
-            <div
-              class="menu-spacer hideOnWidescreen"
-            />
-            <div
-              class="menu-options hideOnWidescreen"
-            >
-              <div
-                aria-label="Cancel"
-                class="MenuOption TextOption menu-option menu-cancel"
-                role="button"
-              >
-                <div
-                  class="d-flex"
-                >
-                  <div
-                    class="noicon"
-                  />
-                </div>
-                <div
-                  class="menu-option__content"
-                >
-                  <div
-                    class="menu-name"
-                  >
-                    Cancel
-                  </div>
-                </div>
-                <div
-                  class="noicon"
-                />
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`src/components/shareBoard/channelPermissionsRow should match snapshot when board has no channel id 1`] = `<div />`;
-
-exports[`src/components/shareBoard/channelPermissionsRow should match snapshot when no plugin mode 1`] = `<div />`;
-
-exports[`src/components/shareBoard/channelPermissionsRow should match snapshot with menu open 1`] = `
-<div>
-  <div
-    class="user-item channel-item"
-  >
-    <div
-      class="user-item__content"
-    >
-      <span
-        class="user-item__img"
-      >
-        <i
-          class="CompassIcon icon-globe GlobeIcon"
-        />
-      </span>
-      <div
-        class="ml-3"
-      >
-        <strong>
-          Test Channel
-        </strong>
-      </div>
-    </div>
-    <div>
-      <div
-        aria-label="menuwrapper"
-        class="MenuWrapper override menuOpened"
-        role="button"
-      >
-        <button
-          class="user-item__button"
-        >
-          Editor
-          <i
-            class="CompassIcon icon-chevron-down CompassIcon"
-          />
-        </button>
-        <div
-          class="Menu noselect left "
-        >
-          <div
-            class="menu-contents"
-          >
-            <div
-              class="menu-options"
-            >
-              <div>
-                <div
-                  aria-label="Unlink"
-                  class="MenuOption TextOption menu-option"
-                  role="button"
-                >
-                  <div
-                    class="d-flex"
-                  >
-                    <div
-                      class="menu-option__icon"
-                    >
-                      <i
-                        class="CompassIcon icon-trash-can-outline DeleteIcon trash-can-outline"
-                      />
-                    </div>
-                  </div>
-                  <div
-                    class="menu-option__content"
-                  >
-                    <div
-                      class="menu-name"
-                    >
-                      Unlink
-                    </div>
-                  </div>
-                  <div
-                    class="noicon"
-                  />
-                </div>
-              </div>
-            </div>
-            <div
-              class="menu-spacer hideOnWidescreen"
-            />
-            <div
-              class="menu-options hideOnWidescreen"
-            >
-              <div
-                aria-label="Cancel"
-                class="MenuOption TextOption menu-option menu-cancel"
-                role="button"
-              >
-                <div
-                  class="d-flex"
-                >
-                  <div
-                    class="noicon"
-                  />
-                </div>
-                <div
-                  class="menu-option__content"
-                >
-                  <div
-                    class="menu-name"
-                  >
-                    Cancel
-                  </div>
-                </div>
-                <div
-                  class="noicon"
-                />
-              </div>
-            </div>
-          </div>
-        </div>
-      </div>
-    </div>
-  </div>
-</div>
-`;
-
-exports[`src/components/shareBoard/channelPermissionsRow should match snapshot with unknown channel 1`] = `
-<div>
-  <div
-    class="user-item channel-item"
-  >
-    <div
-      class="user-item__content"
-    >
-      <span
-        class="user-item__img"
-      >
-        <i
-          class="CompassIcon icon-lock-outline LockOutlineIcon"
-        />
-      </span>
-      <div
-        class="ml-3"
-      >
-        <strong>
-          Unknown channel
-        </strong>
-      </div>
-    </div>
-    <div>
-      <div
-        aria-label="menuwrapper"
-        class="MenuWrapper"
-        role="button"
-      >
-        <button
-          class="user-item__button"
-        >
-          Editor
-          <i
-            class="CompassIcon icon-chevron-down CompassIcon"
-          />
-        </button>
-      </div>
-    </div>
-  </div>
-</div>
-`;
diff --git a/webapp/src/components/shareBoard/__snapshots__/shareBoard.test.tsx.snap b/webapp/src/components/shareBoard/__snapshots__/shareBoard.test.tsx.snap
index 2db558d6b8c..b2e4335ff13 100644
--- a/webapp/src/components/shareBoard/__snapshots__/shareBoard.test.tsx.snap
+++ b/webapp/src/components/shareBoard/__snapshots__/shareBoard.test.tsx.snap
@@ -114,9 +114,6 @@ exports[`src/components/shareBoard/shareBoard confirm unlinking linked channel 1
             <div
               class="user-item__content"
             >
-              <i
-                class="CompassIcon icon-mattermost user-item__img"
-              />
               <div
                 class="ml-3"
               >
@@ -142,44 +139,6 @@ exports[`src/components/shareBoard/shareBoard confirm unlinking linked channel 1
               </div>
             </div>
           </div>
-          <div
-            class="user-item channel-item"
-          >
-            <div
-              class="user-item__content"
-            >
-              <span
-                class="user-item__img"
-              >
-                <i
-                  class="CompassIcon icon-lock-outline LockOutlineIcon"
-                />
-              </span>
-              <div
-                class="ml-3"
-              >
-                <strong>
-                  Dunder Mifflin Party Planing Committee
-                </strong>
-              </div>
-            </div>
-            <div>
-              <div
-                aria-label="menuwrapper"
-                class="MenuWrapper"
-                role="button"
-              >
-                <button
-                  class="user-item__button"
-                >
-                  Editor
-                  <i
-                    class="CompassIcon icon-chevron-down CompassIcon"
-                  />
-                </button>
-              </div>
-            </div>
-          </div>
         </div>
         <div
           class="tabs-container"
@@ -1022,9 +981,6 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
             <div
               class="user-item__content"
             >
-              <i
-                class="CompassIcon icon-mattermost user-item__img"
-              />
               <div
                 class="ml-3"
               >
@@ -1050,44 +1006,6 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
               </div>
             </div>
           </div>
-          <div
-            class="user-item channel-item"
-          >
-            <div
-              class="user-item__content"
-            >
-              <span
-                class="user-item__img"
-              >
-                <i
-                  class="CompassIcon icon-lock-outline LockOutlineIcon"
-                />
-              </span>
-              <div
-                class="ml-3"
-              >
-                <strong>
-                  Dunder Mifflin Party Planing Committee
-                </strong>
-              </div>
-            </div>
-            <div>
-              <div
-                aria-label="menuwrapper"
-                class="MenuWrapper"
-                role="button"
-              >
-                <button
-                  class="user-item__button"
-                >
-                  Editor
-                  <i
-                    class="CompassIcon icon-chevron-down CompassIcon"
-                  />
-                </button>
-              </div>
-            </div>
-          </div>
         </div>
         <div
           class="tabs-content"
@@ -1217,7 +1135,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
                 <span
                   id="aria-results"
                 >
-                  8 results available.
+                  4 results available.
                 </span>
                 <span
                   id="aria-guidance"
@@ -1242,7 +1160,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
                     data-value=""
                   >
                     <input
-                      aria-activedescendant="react-select-10-option-0-0"
+                      aria-activedescendant="react-select-10-option-0"
                       aria-autocomplete="list"
                       aria-controls="react-select-10-listbox"
                       aria-describedby="react-select-10-placeholder"
@@ -1276,230 +1194,102 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
                   role="listbox"
                 >
                   <div
-                    class=" css-syji7d-Group"
+                    aria-disabled="false"
+                    aria-selected="false"
+                    class=" css-8e5kjb-option"
+                    id="react-select-10-option-0"
+                    role="option"
+                    tabindex="-1"
                   >
                     <div
-                      class=" css-jtaw72-group"
-                      id="react-select-10-group-0-heading"
+                      class="user-item"
                     >
-                      Members
-                    </div>
-                    <div>
                       <div
-                        aria-disabled="false"
-                        aria-selected="false"
-                        class=" css-8e5kjb-option"
-                        id="react-select-10-option-0-0"
-                        role="option"
-                        tabindex="-1"
+                        class="ml-3"
                       >
-                        <div
-                          class="user-item"
-                        >
-                          <img
-                            class="user-item__img"
-                          />
-                          <div
-                            class="ml-3"
-                          >
-                            <strong>
-                              username_1
-                            </strong>
-                            <strong
-                              class="ml-2 text-light"
-                            >
-                              @username_1
-                            </strong>
-                          </div>
-                        </div>
-                      </div>
-                      <div
-                        aria-disabled="false"
-                        aria-selected="false"
-                        class=" css-x3yilo-option"
-                        id="react-select-10-option-0-1"
-                        role="option"
-                        tabindex="-1"
-                      >
-                        <div
-                          class="user-item"
+                        <strong>
+                          username_1
+                        </strong>
+                        <strong
+                          class="ml-2 text-light"
                         >
-                          <img
-                            class="user-item__img"
-                          />
-                          <div
-                            class="ml-3"
-                          >
-                            <strong>
-                              username_2
-                            </strong>
-                            <strong
-                              class="ml-2 text-light"
-                            >
-                              @username_2
-                            </strong>
-                          </div>
-                        </div>
-                      </div>
-                      <div
-                        aria-disabled="false"
-                        aria-selected="false"
-                        class=" css-x3yilo-option"
-                        id="react-select-10-option-0-2"
-                        role="option"
-                        tabindex="-1"
-                      >
-                        <div
-                          class="user-item"
-                        >
-                          <img
-                            class="user-item__img"
-                          />
-                          <div
-                            class="ml-3"
-                          >
-                            <strong>
-                              username_3
-                            </strong>
-                            <strong
-                              class="ml-2 text-light"
-                            >
-                              @username_3
-                            </strong>
-                          </div>
-                        </div>
-                      </div>
-                      <div
-                        aria-disabled="false"
-                        aria-selected="false"
-                        class=" css-x3yilo-option"
-                        id="react-select-10-option-0-3"
-                        role="option"
-                        tabindex="-1"
-                      >
-                        <div
-                          class="user-item"
-                        >
-                          <img
-                            class="user-item__img"
-                          />
-                          <div
-                            class="ml-3"
-                          >
-                            <strong>
-                              username_4
-                            </strong>
-                            <strong
-                              class="ml-2 text-light"
-                            >
-                              @username_4
-                            </strong>
-                          </div>
-                        </div>
+                          @username_1
+                        </strong>
                       </div>
                     </div>
                   </div>
                   <div
-                    class=" css-syji7d-Group"
+                    aria-disabled="false"
+                    aria-selected="false"
+                    class=" css-x3yilo-option"
+                    id="react-select-10-option-1"
+                    role="option"
+                    tabindex="-1"
                   >
                     <div
-                      class=" css-jtaw72-group"
-                      id="react-select-10-group-1-heading"
+                      class="user-item"
                     >
-                      Channels
-                    </div>
-                    <div>
                       <div
-                        aria-disabled="false"
-                        aria-selected="false"
-                        class=" css-x3yilo-option"
-                        id="react-select-10-option-1-0"
-                        role="option"
-                        tabindex="-1"
+                        class="ml-3"
                       >
-                        <div
-                          class="user-item"
+                        <strong>
+                          username_2
+                        </strong>
+                        <strong
+                          class="ml-2 text-light"
                         >
-                          <i
-                            class="CompassIcon icon-lock-outline LockOutlineIcon"
-                          />
-                          <div
-                            class="ml-3"
-                          >
-                            <strong>
-                              Channel 1
-                            </strong>
-                          </div>
-                        </div>
-                      </div>
-                      <div
-                        aria-disabled="false"
-                        aria-selected="false"
-                        class=" css-x3yilo-option"
-                        id="react-select-10-option-1-1"
-                        role="option"
-                        tabindex="-1"
-                      >
-                        <div
-                          class="user-item"
-                        >
-                          <i
-                            class="CompassIcon icon-lock-outline LockOutlineIcon"
-                          />
-                          <div
-                            class="ml-3"
-                          >
-                            <strong>
-                              Channel 2
-                            </strong>
-                          </div>
-                        </div>
+                          @username_2
+                        </strong>
                       </div>
+                    </div>
+                  </div>
+                  <div
+                    aria-disabled="false"
+                    aria-selected="false"
+                    class=" css-x3yilo-option"
+                    id="react-select-10-option-2"
+                    role="option"
+                    tabindex="-1"
+                  >
+                    <div
+                      class="user-item"
+                    >
                       <div
-                        aria-disabled="false"
-                        aria-selected="false"
-                        class=" css-x3yilo-option"
-                        id="react-select-10-option-1-2"
-                        role="option"
-                        tabindex="-1"
+                        class="ml-3"
                       >
-                        <div
-                          class="user-item"
+                        <strong>
+                          username_3
+                        </strong>
+                        <strong
+                          class="ml-2 text-light"
                         >
-                          <i
-                            class="CompassIcon icon-globe GlobeIcon"
-                          />
-                          <div
-                            class="ml-3"
-                          >
-                            <strong>
-                              Channel 3
-                            </strong>
-                          </div>
-                        </div>
+                          @username_3
+                        </strong>
                       </div>
+                    </div>
+                  </div>
+                  <div
+                    aria-disabled="false"
+                    aria-selected="false"
+                    class=" css-x3yilo-option"
+                    id="react-select-10-option-3"
+                    role="option"
+                    tabindex="-1"
+                  >
+                    <div
+                      class="user-item"
+                    >
                       <div
-                        aria-disabled="false"
-                        aria-selected="false"
-                        class=" css-x3yilo-option"
-                        id="react-select-10-option-1-3"
-                        role="option"
-                        tabindex="-1"
+                        class="ml-3"
                       >
-                        <div
-                          class="user-item"
+                        <strong>
+                          username_4
+                        </strong>
+                        <strong
+                          class="ml-2 text-light"
                         >
-                          <i
-                            class="CompassIcon icon-globe GlobeIcon"
-                          />
-                          <div
-                            class="ml-3"
-                          >
-                            <strong>
-                              Channel 4
-                            </strong>
-                          </div>
-                        </div>
+                          @username_4
+                        </strong>
                       </div>
                     </div>
                   </div>
@@ -1517,9 +1307,6 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
             <div
               class="user-item__content"
             >
-              <i
-                class="CompassIcon icon-mattermost user-item__img"
-              />
               <div
                 class="ml-3"
               >
@@ -1545,44 +1332,6 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
               </div>
             </div>
           </div>
-          <div
-            class="user-item channel-item"
-          >
-            <div
-              class="user-item__content"
-            >
-              <span
-                class="user-item__img"
-              >
-                <i
-                  class="CompassIcon icon-lock-outline LockOutlineIcon"
-                />
-              </span>
-              <div
-                class="ml-3"
-              >
-                <strong>
-                  Dunder Mifflin Party Planing Committee
-                </strong>
-              </div>
-            </div>
-            <div>
-              <div
-                aria-label="menuwrapper"
-                class="MenuWrapper"
-                role="button"
-              >
-                <button
-                  class="user-item__button"
-                >
-                  Editor
-                  <i
-                    class="CompassIcon icon-chevron-down CompassIcon"
-                  />
-                </button>
-              </div>
-            </div>
-          </div>
         </div>
         <div
           class="tabs-content"
@@ -1755,9 +1504,6 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
             <div
               class="user-item__content"
             >
-              <i
-                class="CompassIcon icon-mattermost user-item__img"
-              />
               <div
                 class="ml-3"
               >
@@ -1783,44 +1529,6 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
               </div>
             </div>
           </div>
-          <div
-            class="user-item channel-item"
-          >
-            <div
-              class="user-item__content"
-            >
-              <span
-                class="user-item__img"
-              >
-                <i
-                  class="CompassIcon icon-lock-outline LockOutlineIcon"
-                />
-              </span>
-              <div
-                class="ml-3"
-              >
-                <strong>
-                  Dunder Mifflin Party Planing Committee
-                </strong>
-              </div>
-            </div>
-            <div>
-              <div
-                aria-label="menuwrapper"
-                class="MenuWrapper"
-                role="button"
-              >
-                <button
-                  class="user-item__button"
-                >
-                  Editor
-                  <i
-                    class="CompassIcon icon-chevron-down CompassIcon"
-                  />
-                </button>
-              </div>
-            </div>
-          </div>
         </div>
         <div
           class="tabs-content"
@@ -1950,7 +1658,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
                 <span
                   id="aria-results"
                 >
-                  8 results available.
+                  4 results available.
                 </span>
                 <span
                   id="aria-guidance"
@@ -1975,7 +1683,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
                     data-value=""
                   >
                     <input
-                      aria-activedescendant="react-select-11-option-0-0"
+                      aria-activedescendant="react-select-11-option-0"
                       aria-autocomplete="list"
                       aria-controls="react-select-11-listbox"
                       aria-describedby="react-select-11-placeholder"
@@ -2009,248 +1717,120 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
                   role="listbox"
                 >
                   <div
-                    class=" css-syji7d-Group"
+                    aria-disabled="false"
+                    aria-selected="false"
+                    class=" css-8e5kjb-option"
+                    id="react-select-11-option-0"
+                    role="option"
+                    tabindex="-1"
                   >
                     <div
-                      class=" css-jtaw72-group"
-                      id="react-select-11-group-0-heading"
+                      class="user-item"
                     >
-                      Members
-                    </div>
-                    <div>
                       <div
-                        aria-disabled="false"
-                        aria-selected="false"
-                        class=" css-8e5kjb-option"
-                        id="react-select-11-option-0-0"
-                        role="option"
-                        tabindex="-1"
+                        class="ml-3"
                       >
-                        <div
-                          class="user-item"
+                        <strong>
+                          username_1
+                        </strong>
+                        <strong
+                          class="ml-2 text-light"
                         >
-                          <img
-                            class="user-item__img"
-                          />
-                          <div
-                            class="ml-3"
-                          >
-                            <strong>
-                              username_1
-                            </strong>
-                            <strong
-                              class="ml-2 text-light"
-                            >
-                              @username_1
-                            </strong>
-                            <div
-                              class="AdminBadge"
-                            >
-                              <div
-                                class="AdminBadge__box"
-                              >
-                                Team Admin
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                      <div
-                        aria-disabled="false"
-                        aria-selected="false"
-                        class=" css-x3yilo-option"
-                        id="react-select-11-option-0-1"
-                        role="option"
-                        tabindex="-1"
-                      >
+                          @username_1
+                        </strong>
                         <div
-                          class="user-item"
+                          class="AdminBadge"
                         >
-                          <img
-                            class="user-item__img"
-                          />
                           <div
-                            class="ml-3"
+                            class="AdminBadge__box"
                           >
-                            <strong>
-                              username_2
-                            </strong>
-                            <strong
-                              class="ml-2 text-light"
-                            >
-                              @username_2
-                            </strong>
-                            <div
-                              class="AdminBadge"
-                            >
-                              <div
-                                class="AdminBadge__box"
-                              >
-                                Admin
-                              </div>
-                            </div>
-                          </div>
-                        </div>
-                      </div>
-                      <div
-                        aria-disabled="false"
-                        aria-selected="false"
-                        class=" css-x3yilo-option"
-                        id="react-select-11-option-0-2"
-                        role="option"
-                        tabindex="-1"
-                      >
-                        <div
-                          class="user-item"
-                        >
-                          <img
-                            class="user-item__img"
-                          />
-                          <div
-                            class="ml-3"
-                          >
-                            <strong>
-                              username_3
-                            </strong>
-                            <strong
-                              class="ml-2 text-light"
-                            >
-                              @username_3
-                            </strong>
-                          </div>
-                        </div>
-                      </div>
-                      <div
-                        aria-disabled="false"
-                        aria-selected="false"
-                        class=" css-x3yilo-option"
-                        id="react-select-11-option-0-3"
-                        role="option"
-                        tabindex="-1"
-                      >
-                        <div
-                          class="user-item"
-                        >
-                          <img
-                            class="user-item__img"
-                          />
-                          <div
-                            class="ml-3"
-                          >
-                            <strong>
-                              username_4
-                            </strong>
-                            <strong
-                              class="ml-2 text-light"
-                            >
-                              @username_4
-                            </strong>
+                            Team Admin
                           </div>
                         </div>
                       </div>
                     </div>
                   </div>
                   <div
-                    class=" css-syji7d-Group"
+                    aria-disabled="false"
+                    aria-selected="false"
+                    class=" css-x3yilo-option"
+                    id="react-select-11-option-1"
+                    role="option"
+                    tabindex="-1"
                   >
                     <div
-                      class=" css-jtaw72-group"
-                      id="react-select-11-group-1-heading"
+                      class="user-item"
                     >
-                      Channels
-                    </div>
-                    <div>
                       <div
-                        aria-disabled="false"
-                        aria-selected="false"
-                        class=" css-x3yilo-option"
-                        id="react-select-11-option-1-0"
-                        role="option"
-                        tabindex="-1"
+                        class="ml-3"
                       >
-                        <div
-                          class="user-item"
+                        <strong>
+                          username_2
+                        </strong>
+                        <strong
+                          class="ml-2 text-light"
                         >
-                          <i
-                            class="CompassIcon icon-lock-outline LockOutlineIcon"
-                          />
-                          <div
-                            class="ml-3"
-                          >
-                            <strong>
-                              Channel 1
-                            </strong>
-                          </div>
-                        </div>
-                      </div>
-                      <div
-                        aria-disabled="false"
-                        aria-selected="false"
-                        class=" css-x3yilo-option"
-                        id="react-select-11-option-1-1"
-                        role="option"
-                        tabindex="-1"
-                      >
+                          @username_2
+                        </strong>
                         <div
-                          class="user-item"
+                          class="AdminBadge"
                         >
-                          <i
-                            class="CompassIcon icon-lock-outline LockOutlineIcon"
-                          />
                           <div
-                            class="ml-3"
+                            class="AdminBadge__box"
                           >
-                            <strong>
-                              Channel 2
-                            </strong>
+                            Admin
                           </div>
                         </div>
                       </div>
+                    </div>
+                  </div>
+                  <div
+                    aria-disabled="false"
+                    aria-selected="false"
+                    class=" css-x3yilo-option"
+                    id="react-select-11-option-2"
+                    role="option"
+                    tabindex="-1"
+                  >
+                    <div
+                      class="user-item"
+                    >
                       <div
-                        aria-disabled="false"
-                        aria-selected="false"
-                        class=" css-x3yilo-option"
-                        id="react-select-11-option-1-2"
-                        role="option"
-                        tabindex="-1"
+                        class="ml-3"
                       >
-                        <div
-                          class="user-item"
+                        <strong>
+                          username_3
+                        </strong>
+                        <strong
+                          class="ml-2 text-light"
                         >
-                          <i
-                            class="CompassIcon icon-globe GlobeIcon"
-                          />
-                          <div
-                            class="ml-3"
-                          >
-                            <strong>
-                              Channel 3
-                            </strong>
-                          </div>
-                        </div>
+                          @username_3
+                        </strong>
                       </div>
+                    </div>
+                  </div>
+                  <div
+                    aria-disabled="false"
+                    aria-selected="false"
+                    class=" css-x3yilo-option"
+                    id="react-select-11-option-3"
+                    role="option"
+                    tabindex="-1"
+                  >
+                    <div
+                      class="user-item"
+                    >
                       <div
-                        aria-disabled="false"
-                        aria-selected="false"
-                        class=" css-x3yilo-option"
-                        id="react-select-11-option-1-3"
-                        role="option"
-                        tabindex="-1"
+                        class="ml-3"
                       >
-                        <div
-                          class="user-item"
+                        <strong>
+                          username_4
+                        </strong>
+                        <strong
+                          class="ml-2 text-light"
                         >
-                          <i
-                            class="CompassIcon icon-globe GlobeIcon"
-                          />
-                          <div
-                            class="ml-3"
-                          >
-                            <strong>
-                              Channel 4
-                            </strong>
-                          </div>
-                        </div>
+                          @username_4
+                        </strong>
                       </div>
                     </div>
                   </div>
@@ -2268,9 +1848,6 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
             <div
               class="user-item__content"
             >
-              <i
-                class="CompassIcon icon-mattermost user-item__img"
-              />
               <div
                 class="ml-3"
               >
@@ -2296,44 +1873,6 @@ exports[`src/components/shareBoard/shareBoard return shareBoard and click Select
               </div>
             </div>
           </div>
-          <div
-            class="user-item channel-item"
-          >
-            <div
-              class="user-item__content"
-            >
-              <span
-                class="user-item__img"
-              >
-                <i
-                  class="CompassIcon icon-lock-outline LockOutlineIcon"
-                />
-              </span>
-              <div
-                class="ml-3"
-              >
-                <strong>
-                  Dunder Mifflin Party Planing Committee
-                </strong>
-              </div>
-            </div>
-            <div>
-              <div
-                aria-label="menuwrapper"
-                class="MenuWrapper"
-                role="button"
-              >
-                <button
-                  class="user-item__button"
-                >
-                  Editor
-                  <i
-                    class="CompassIcon icon-chevron-down CompassIcon"
-                  />
-                </button>
-              </div>
-            </div>
-          </div>
         </div>
         <div
           class="tabs-content"
@@ -2506,9 +2045,6 @@ exports[`src/components/shareBoard/shareBoard return shareBoard template and cli
             <div
               class="user-item__content"
             >
-              <i
-                class="CompassIcon icon-mattermost user-item__img"
-              />
               <div
                 class="ml-3"
               >
@@ -2534,44 +2070,6 @@ exports[`src/components/shareBoard/shareBoard return shareBoard template and cli
               </div>
             </div>
           </div>
-          <div
-            class="user-item channel-item"
-          >
-            <div
-              class="user-item__content"
-            >
-              <span
-                class="user-item__img"
-              >
-                <i
-                  class="CompassIcon icon-lock-outline LockOutlineIcon"
-                />
-              </span>
-              <div
-                class="ml-3"
-              >
-                <strong>
-                  Dunder Mifflin Party Planing Committee
-                </strong>
-              </div>
-            </div>
-            <div>
-              <div
-                aria-label="menuwrapper"
-                class="MenuWrapper"
-                role="button"
-              >
-                <button
-                  class="user-item__button"
-                >
-                  Editor
-                  <i
-                    class="CompassIcon icon-chevron-down CompassIcon"
-                  />
-                </button>
-              </div>
-            </div>
-          </div>
         </div>
       </div>
     </div>
@@ -2675,7 +2173,7 @@ exports[`src/components/shareBoard/shareBoard return shareBoard template and cli
                     data-value=""
                   >
                     <input
-                      aria-activedescendant="react-select-14-option-0-0"
+                      aria-activedescendant="react-select-14-option-0"
                       aria-autocomplete="list"
                       aria-controls="react-select-14-listbox"
                       aria-describedby="react-select-14-placeholder"
@@ -2709,126 +2207,102 @@ exports[`src/components/shareBoard/shareBoard return shareBoard template and cli
                   role="listbox"
                 >
                   <div
-                    class=" css-syji7d-Group"
+                    aria-disabled="false"
+                    aria-selected="false"
+                    class=" css-8e5kjb-option"
+                    id="react-select-14-option-0"
+                    role="option"
+                    tabindex="-1"
                   >
                     <div
-                      class=" css-jtaw72-group"
-                      id="react-select-14-group-0-heading"
+                      class="user-item"
                     >
-                      Members
-                    </div>
-                    <div>
                       <div
-                        aria-disabled="false"
-                        aria-selected="false"
-                        class=" css-8e5kjb-option"
-                        id="react-select-14-option-0-0"
-                        role="option"
-                        tabindex="-1"
+                        class="ml-3"
                       >
-                        <div
-                          class="user-item"
+                        <strong>
+                          username_1
+                        </strong>
+                        <strong
+                          class="ml-2 text-light"
                         >
-                          <img
-                            class="user-item__img"
-                          />
-                          <div
-                            class="ml-3"
-                          >
-                            <strong>
-                              username_1
-                            </strong>
-                            <strong
-                              class="ml-2 text-light"
-                            >
-                              @username_1
-                            </strong>
-                          </div>
-                        </div>
+                          @username_1
+                        </strong>
                       </div>
+                    </div>
+                  </div>
+                  <div
+                    aria-disabled="false"
+                    aria-selected="false"
+                    class=" css-x3yilo-option"
+                    id="react-select-14-option-1"
+                    role="option"
+                    tabindex="-1"
+                  >
+                    <div
+                      class="user-item"
+                    >
                       <div
-                        aria-disabled="false"
-                        aria-selected="false"
-                        class=" css-x3yilo-option"
-                        id="react-select-14-option-0-1"
-                        role="option"
-                        tabindex="-1"
+                        class="ml-3"
                       >
-                        <div
-                          class="user-item"
+                        <strong>
+                          username_2
+                        </strong>
+                        <strong
+                          class="ml-2 text-light"
                         >
-                          <img
-                            class="user-item__img"
-                          />
-                          <div
-                            class="ml-3"
-                          >
-                            <strong>
-                              username_2
-                            </strong>
-                            <strong
-                              class="ml-2 text-light"
-                            >
-                              @username_2
-                            </strong>
-                          </div>
-                        </div>
+                          @username_2
+                        </strong>
                       </div>
+                    </div>
+                  </div>
+                  <div
+                    aria-disabled="false"
+                    aria-selected="false"
+                    class=" css-x3yilo-option"
+                    id="react-select-14-option-2"
+                    role="option"
+                    tabindex="-1"
+                  >
+                    <div
+                      class="user-item"
+                    >
                       <div
-                        aria-disabled="false"
-                        aria-selected="false"
-                        class=" css-x3yilo-option"
-                        id="react-select-14-option-0-2"
-                        role="option"
-                        tabindex="-1"
+                        class="ml-3"
                       >
-                        <div
-                          class="user-item"
+                        <strong>
+                          username_3
+                        </strong>
+                        <strong
+                          class="ml-2 text-light"
                         >
-                          <img
-                            class="user-item__img"
-                          />
-                          <div
-                            class="ml-3"
-                          >
-                            <strong>
-                              username_3
-                            </strong>
-                            <strong
-                              class="ml-2 text-light"
-                            >
-                              @username_3
-                            </strong>
-                          </div>
-                        </div>
+                          @username_3
+                        </strong>
                       </div>
+                    </div>
+                  </div>
+                  <div
+                    aria-disabled="false"
+                    aria-selected="false"
+                    class=" css-x3yilo-option"
+                    id="react-select-14-option-3"
+                    role="option"
+                    tabindex="-1"
+                  >
+                    <div
+                      class="user-item"
+                    >
                       <div
-                        aria-disabled="false"
-                        aria-selected="false"
-                        class=" css-x3yilo-option"
-                        id="react-select-14-option-0-3"
-                        role="option"
-                        tabindex="-1"
+                        class="ml-3"
                       >
-                        <div
-                          class="user-item"
+                        <strong>
+                          username_4
+                        </strong>
+                        <strong
+                          class="ml-2 text-light"
                         >
-                          <img
-                            class="user-item__img"
-                          />
-                          <div
-                            class="ml-3"
-                          >
-                            <strong>
-                              username_4
-                            </strong>
-                            <strong
-                              class="ml-2 text-light"
-                            >
-                              @username_4
-                            </strong>
-                          </div>
-                        </div>
+                          @username_4
+                        </strong>
                       </div>
                     </div>
                   </div>
@@ -2846,9 +2320,6 @@ exports[`src/components/shareBoard/shareBoard return shareBoard template and cli
             <div
               class="user-item__content"
             >
-              <i
-                class="CompassIcon icon-mattermost user-item__img"
-              />
               <div
                 class="ml-3"
               >
@@ -2874,44 +2345,6 @@ exports[`src/components/shareBoard/shareBoard return shareBoard template and cli
               </div>
             </div>
           </div>
-          <div
-            class="user-item channel-item"
-          >
-            <div
-              class="user-item__content"
-            >
-              <span
-                class="user-item__img"
-              >
-                <i
-                  class="CompassIcon icon-lock-outline LockOutlineIcon"
-                />
-              </span>
-              <div
-                class="ml-3"
-              >
-                <strong>
-                  Dunder Mifflin Party Planing Committee
-                </strong>
-              </div>
-            </div>
-            <div>
-              <div
-                aria-label="menuwrapper"
-                class="MenuWrapper"
-                role="button"
-              >
-                <button
-                  class="user-item__button"
-                >
-                  Editor
-                  <i
-                    class="CompassIcon icon-chevron-down CompassIcon"
-                  />
-                </button>
-              </div>
-            </div>
-          </div>
         </div>
       </div>
     </div>
@@ -4345,9 +3778,6 @@ exports[`src/components/shareBoard/shareBoard should match snapshot, with templa
             <div
               class="user-item__content"
             >
-              <i
-                class="CompassIcon icon-mattermost user-item__img"
-              />
               <div
                 class="ml-3"
               >
@@ -4373,44 +3803,6 @@ exports[`src/components/shareBoard/shareBoard should match snapshot, with templa
               </div>
             </div>
           </div>
-          <div
-            class="user-item channel-item"
-          >
-            <div
-              class="user-item__content"
-            >
-              <span
-                class="user-item__img"
-              >
-                <i
-                  class="CompassIcon icon-lock-outline LockOutlineIcon"
-                />
-              </span>
-              <div
-                class="ml-3"
-              >
-                <strong>
-                  Dunder Mifflin Party Planing Committee
-                </strong>
-              </div>
-            </div>
-            <div>
-              <div
-                aria-label="menuwrapper"
-                class="MenuWrapper"
-                role="button"
-              >
-                <button
-                  class="user-item__button"
-                >
-                  Editor
-                  <i
-                    class="CompassIcon icon-chevron-down CompassIcon"
-                  />
-                </button>
-              </div>
-            </div>
-          </div>
         </div>
       </div>
     </div>
diff --git a/webapp/src/components/shareBoard/__snapshots__/teamPermissionsRow.test.tsx.snap b/webapp/src/components/shareBoard/__snapshots__/teamPermissionsRow.test.tsx.snap
index be7e66d97b1..17db0541b53 100644
--- a/webapp/src/components/shareBoard/__snapshots__/teamPermissionsRow.test.tsx.snap
+++ b/webapp/src/components/shareBoard/__snapshots__/teamPermissionsRow.test.tsx.snap
@@ -218,9 +218,6 @@ exports[`src/components/shareBoard/teamPermissionsRow should match snapshot in p
     <div
       class="user-item__content"
     >
-      <i
-        class="CompassIcon icon-mattermost user-item__img"
-      />
       <div
         class="ml-3"
       >
@@ -431,9 +428,6 @@ exports[`src/components/shareBoard/teamPermissionsRow should match snapshot in t
     <div
       class="user-item__content"
     >
-      <i
-        class="CompassIcon icon-mattermost user-item__img"
-      />
       <div
         class="ml-3"
       >
diff --git a/webapp/src/components/shareBoard/__snapshots__/userPermissionsRow.test.tsx.snap b/webapp/src/components/shareBoard/__snapshots__/userPermissionsRow.test.tsx.snap
index 8745f3ea7f1..bb961db7b7e 100644
--- a/webapp/src/components/shareBoard/__snapshots__/userPermissionsRow.test.tsx.snap
+++ b/webapp/src/components/shareBoard/__snapshots__/userPermissionsRow.test.tsx.snap
@@ -259,9 +259,6 @@ exports[`src/components/shareBoard/userPermissionsRow should match snapshot in p
     <div
       class="user-item__content"
     >
-      <img
-        class="user-item__img"
-      />
       <div
         class="ml-3"
       >
@@ -513,9 +510,6 @@ exports[`src/components/shareBoard/userPermissionsRow should match snapshot in t
     <div
       class="user-item__content"
     >
-      <img
-        class="user-item__img"
-      />
       <div
         class="ml-3"
       >
diff --git a/webapp/src/components/shareBoard/shareBoard.test.tsx b/webapp/src/components/shareBoard/shareBoard.test.tsx
index d09f6840a0d..bb1ef2ae6ec 100644
--- a/webapp/src/components/shareBoard/shareBoard.test.tsx
+++ b/webapp/src/components/shareBoard/shareBoard.test.tsx
@@ -587,49 +587,6 @@ describe('src/components/shareBoard/shareBoard', () => {
         expect(container).toMatchSnapshot()
     })
 
-    test('confirm unlinking linked channel', async () => {
-        const sharing: ISharing = {
-            id: '',
-            enabled: false,
-            token: '',
-        }
-        mockedOctoClient.getSharing.mockResolvedValue(sharing)
-
-        let container: Element | DocumentFragment | null = null
-        await act(async () => {
-            const result = render(
-                wrapDNDIntl(
-                    <ReduxProvider store={store}>
-                        <ShareBoard
-                            onClose={jest.fn()}
-                            enableSharedBoards={true}
-                        />
-                    </ReduxProvider>),
-                {wrapper: MemoryRouter},
-            )
-            container = result.container
-        })
-
-        expect(container).toMatchSnapshot()
-
-        const channelMenuBtn = container!.querySelector('.user-item.channel-item .MenuWrapper')
-        expect(channelMenuBtn).not.toBeNull()
-        userEvent.click(channelMenuBtn as Element)
-
-        const unlinkOption = screen.getByText('Unlink')
-        expect(unlinkOption).not.toBeNull()
-        userEvent.click(unlinkOption)
-
-        const unlinkConfirmationBtn = screen.getByText('Unlink channel')
-        expect(unlinkConfirmationBtn).not.toBeNull()
-        userEvent.click(unlinkConfirmationBtn)
-
-        expect(mockedOctoClient.patchBoard).toBeCalled()
-
-        const closeButton = screen.getByRole('button', {name: 'Close dialog'})
-        expect(closeButton).toBeDefined()
-    })
-
     test('should match snapshot, with template', async () => {
         const sharing: ISharing = {
             id: '',
diff --git a/webapp/src/pages/welcome/__snapshots__/welcomePage.test.tsx.snap b/webapp/src/pages/welcome/__snapshots__/welcomePage.test.tsx.snap
index ef9ac5df44f..4fc29f1cccb 100644
--- a/webapp/src/pages/welcome/__snapshots__/welcomePage.test.tsx.snap
+++ b/webapp/src/pages/welcome/__snapshots__/welcomePage.test.tsx.snap
@@ -24,12 +24,12 @@ exports[`pages/welcome Welcome Page shows Explore Page 1`] = `
         <img
           alt="Boards Welcome Image"
           class="WelcomePage__image WelcomePage__image--large"
-          src="test-file-stub"
+          src="http://localhost/test-file-stub"
         />
         <img
           alt="Boards Welcome Image"
           class="WelcomePage__image WelcomePage__image--small"
-          src="test-file-stub"
+          src="http://localhost/test-file-stub"
         />
         <div
           class="WelcomePage__buttons"
@@ -81,12 +81,12 @@ exports[`pages/welcome Welcome Page shows Explore Page with subpath 1`] = `
         <img
           alt="Boards Welcome Image"
           class="WelcomePage__image WelcomePage__image--large"
-          src="test-file-stub"
+          src="http://localhost/subpath/test-file-stub"
         />
         <img
           alt="Boards Welcome Image"
           class="WelcomePage__image WelcomePage__image--small"
-          src="test-file-stub"
+          src="http://localhost/subpath/test-file-stub"
         />
         <div
           class="WelcomePage__buttons"