Merge branch 'develop' into prepare-sass-update

Author: davidmurdoch

ui/components/multichain/connected-site-menu/__snapshots__/connected-site-menu.test.js.snap

@@ -29,10 +29,10 @@ exports[`Connected Site Menu should render the site menu in connected state 1`]
           </div>
           <div
             class="mm-box mm-badge-wrapper__badge-container"
-            style="bottom: -1px; right: -2px; z-index: 1;"
+            style="bottom: -1px; right: -4px; z-index: 1;"
           >
             <div
-              class="mm-box multichain-connected-site-menu__badge not-connected mm-box--background-color-success-default mm-box--rounded-full mm-box--border-color-success-default mm-box--border-width-2 box--border-style-solid"
+              class="mm-box multichain-connected-site-menu__badge mm-box--background-color-success-default mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-3 box--border-style-solid"
             />
           </div>
         </div>
@@ -71,10 +71,10 @@ exports[`Connected Site Menu should render the site menu in not connected state
           </div>
           <div
             class="mm-box mm-badge-wrapper__badge-container"
-            style="bottom: -1px; right: -2px; z-index: 1;"
+            style="bottom: -1px; right: -4px; z-index: 1;"
           >
             <div
-              class="mm-box multichain-connected-site-menu__badge not-connected mm-box--background-color-icon-alternative mm-box--rounded-full mm-box--border-color-success-default mm-box--border-width-2 box--border-style-solid"
+              class="mm-box multichain-connected-site-menu__badge mm-box--background-color-icon-alternative mm-box--rounded-full mm-box--border-color-background-default mm-box--border-width-3 box--border-style-solid"
             />
           </div>
         </div>

ui/components/multichain/connected-site-menu/connected-site-menu.js

@@ -46,10 +46,8 @@ export const ConnectedSiteMenu = ({
   const connectedOrigin = useSelector(getOriginOfCurrentTab);
   const connectedSubjectsMetadata = subjectMetadata[connectedOrigin];
   const isConnectedtoOtherAccountOrSnap =
-    Boolean(connectedSubjectsMetadata?.iconUrl) ||
     status === STATUS_CONNECTED_TO_ANOTHER_ACCOUNT ||
     status === STATUS_CONNECTED_TO_SNAP;
-
   return (
     <Box
       className={classNames('multichain-connected-site-menu', className)}
@@ -74,7 +72,7 @@ export const ConnectedSiteMenu = ({
           positionObj={
             isConnectedtoOtherAccountOrSnap
               ? { bottom: -1, right: -2, zIndex: 1 }
-              : { bottom: 2, right: -4, zIndex: 1 }
+              : { bottom: -1, right: -4, zIndex: 1 }
           }
           badge={
             <Box