diff --git a/src/ROUTES.ts b/src/ROUTES.ts
index 9fc3b5813855..5773d3babfe7 100644
--- a/src/ROUTES.ts
+++ b/src/ROUTES.ts
@@ -59,7 +59,7 @@ const ROUTES = {
         route: 'bank-account/:stepToOpen?',
         getRoute: (stepToOpen = '', policyID = '', backTo?: string) => getUrlWithBackToParam(`bank-account/${stepToOpen}?policyID=${policyID}`, backTo),
     },
-    WORKSPACE_SWITCHER: 'workspaceSwitcher',
+    WORKSPACE_SWITCHER: 'workspace-switcher',
     SETTINGS: 'settings',
     SETTINGS_PROFILE: 'settings/profile',
     SETTINGS_SHARE_CODE: 'settings/shareCode',
diff --git a/src/components/MultipleAvatars.tsx b/src/components/MultipleAvatars.tsx
index 8edcf9931ce2..1d1eea0d20ba 100644
--- a/src/components/MultipleAvatars.tsx
+++ b/src/components/MultipleAvatars.tsx
@@ -153,7 +153,7 @@ function MultipleAvatars({
                     <Avatar
                         source={icons[0].source}
                         size={size}
-                        fill={icons[0].displayInDefaultIconColor ? undefined : icons[0].fill ?? theme.iconSuccessFill}
+                        fill={icons[0].fill}
                         name={icons[0].name}
                         type={icons[0].type}
                         fallbackIcon={icons[0].fallbackIcon}
diff --git a/src/components/SubscriptAvatar.tsx b/src/components/SubscriptAvatar.tsx
index 0398a19eb768..4c20335978e6 100644
--- a/src/components/SubscriptAvatar.tsx
+++ b/src/components/SubscriptAvatar.tsx
@@ -38,6 +38,9 @@ type SubAvatar = {
 
     /** A fallback avatar icon to display when there is an error on loading avatar from remote URL. */
     fallbackIcon?: AvatarSource;
+
+    /** The fill color for the icon. Can be hex, rgb, rgba, or valid react-native named color such as 'red' or 'blue'. */
+    fill?: string;
 };
 
 type SubscriptAvatarProps = {
@@ -108,7 +111,7 @@ function SubscriptAvatar({mainAvatar = {}, secondaryAvatar, subscriptIcon, size
                             ]}
                             source={secondaryAvatar.source}
                             size={isSmall ? CONST.AVATAR_SIZE.SMALL_SUBSCRIPT : CONST.AVATAR_SIZE.SUBSCRIPT}
-                            fill={theme.iconSuccessFill}
+                            fill={secondaryAvatar.fill}
                             name={secondaryAvatar.name}
                             type={secondaryAvatar.type}
                             fallbackIcon={secondaryAvatar.fallbackIcon}
diff --git a/src/libs/Navigation/linkingConfig/getAdaptedStateFromPath.ts b/src/libs/Navigation/linkingConfig/getAdaptedStateFromPath.ts
index 9c9cd5a8db2e..341a4db69e6b 100644
--- a/src/libs/Navigation/linkingConfig/getAdaptedStateFromPath.ts
+++ b/src/libs/Navigation/linkingConfig/getAdaptedStateFromPath.ts
@@ -1,6 +1,7 @@
 /* eslint-disable @typescript-eslint/naming-convention */
 import type {NavigationState, PartialState} from '@react-navigation/native';
 import {getStateFromPath} from '@react-navigation/native';
+import {isAnonymousUser} from '@libs/actions/Session';
 import getIsSmallScreenWidth from '@libs/getIsSmallScreenWidth';
 import getTopmostNestedRHPRoute from '@libs/Navigation/getTopmostNestedRHPRoute';
 import type {BottomTabName, CentralPaneName, FullScreenName, NavigationPartialRoute, RootStackParamList} from '@libs/Navigation/types';
@@ -226,14 +227,15 @@ function getAdaptedState(state: PartialState<NavigationState<RootStackParamList>
 
 const getAdaptedStateFromPath: typeof getStateFromPath = (path, options) => {
     const url = getPathWithoutPolicyID(path);
-    const policyID = extractPolicyIDFromPath(path);
+    const isAnonymous = isAnonymousUser();
+    // Anonymous users don't have access to workspaces
+    const policyID = isAnonymous ? undefined : extractPolicyIDFromPath(path);
 
     const state = getStateFromPath(url, options);
 
     if (state === undefined) {
         throw new Error('Unable to parse path');
     }
-
     const adaptedState = getAdaptedState(state as PartialState<NavigationState<RootStackParamList>>, policyID);
     return adaptedState;
 };
diff --git a/src/pages/TeachersUnite/SaveTheWorldPage.js b/src/pages/TeachersUnite/SaveTheWorldPage.js
index 107c0e39b6a0..03df52050ce5 100644
--- a/src/pages/TeachersUnite/SaveTheWorldPage.js
+++ b/src/pages/TeachersUnite/SaveTheWorldPage.js
@@ -21,7 +21,7 @@ function SaveTheWorldPage() {
             shouldShowBackButton
             title={translate('sidebarScreen.saveTheWorld')}
             backgroundColor={theme.PAGE_THEMES[SCREENS.SAVE_THE_WORLD.ROOT].backgroundColor}
-            onBackButtonPress={() => Navigation.goBack(ROUTES.HOME)}
+            onBackButtonPress={Navigation.goBack}
             illustration={LottieAnimations.SaveTheWorld}
         >
             <View style={[styles.mb4, styles.justifyContentBetween, styles.mh5]}>
diff --git a/src/pages/WorkspaceSwitcherPage.js b/src/pages/WorkspaceSwitcherPage.js
index f2ff3e718930..8eb61fa3c9d6 100644
--- a/src/pages/WorkspaceSwitcherPage.js
+++ b/src/pages/WorkspaceSwitcherPage.js
@@ -177,7 +177,6 @@ function WorkspaceSwitcherPage({policies}) {
                     source: Expensicons.ExpensifyAppIcon,
                     name: CONST.WORKSPACE_SWITCHER.NAME,
                     type: CONST.ICON_TYPE_AVATAR,
-                    displayInDefaultIconColor: true,
                 },
             ],
             brickRoadIndicator: getIndicatorTypeForPolicy(undefined),
diff --git a/src/pages/home/sidebar/SidebarLinksData.js b/src/pages/home/sidebar/SidebarLinksData.js
index efbd9c8e2f5f..1ef44d5f6c48 100644
--- a/src/pages/home/sidebar/SidebarLinksData.js
+++ b/src/pages/home/sidebar/SidebarLinksData.js
@@ -62,6 +62,12 @@ const propTypes = {
 
     // eslint-disable-next-line react/forbid-prop-types
     policyMembers: PropTypes.object,
+
+    /** Session info for the currently logged in user. */
+    session: PropTypes.shape({
+        /** Currently logged in user accountID */
+        accountID: PropTypes.number,
+    }),
 };
 
 const defaultProps = {
@@ -72,6 +78,9 @@ const defaultProps = {
     betas: [],
     policies: {},
     policyMembers: {},
+    session: {
+        accountID: '',
+    },
 };
 
 function SidebarLinksData({
diff --git a/src/types/onyx/OnyxCommon.ts b/src/types/onyx/OnyxCommon.ts
index 8993d1d73e1c..2dafe16b5388 100644
--- a/src/types/onyx/OnyxCommon.ts
+++ b/src/types/onyx/OnyxCommon.ts
@@ -30,9 +30,6 @@ type Icon = {
 
     /** Fill color of the icon */
     fill?: string;
-
-    /** Icon should be displayed in its own color */
-    displayInDefaultIconColor?: boolean;
 };
 
 export type {Icon, PendingAction, PendingFields, ErrorFields, Errors, AvatarType};