From 9000865286816cc28fd53e0fde1d847207a6d46b Mon Sep 17 00:00:00 2001
From: Leslie Ngo <lesliengo@Leslies-MacBook-Air.local>
Date: Fri, 19 Aug 2022 20:04:35 -0700
Subject: [PATCH 1/2] homescreen_icon [nfc]: Swaps TopTabButton with
 TopTabButtonGeneral

to ready the component for icon swap. TopTabButtonGeneral can
consume the SpecificIconType component, which can return icons from
FontAwesome collection. TopTabButton currently returns icons from
the Feather collection.
---
 src/main/HomeScreen.js | 8 +++++---
 1 file changed, 5 insertions(+), 3 deletions(-)

diff --git a/src/main/HomeScreen.js b/src/main/HomeScreen.js
index ee513cd8bb0..64fe90e8413 100644
--- a/src/main/HomeScreen.js
+++ b/src/main/HomeScreen.js
@@ -16,6 +16,7 @@ import { BRAND_COLOR, createStyleSheet } from '../styles';
 import LoadingBanner from '../common/LoadingBanner';
 import ServerCompatBanner from '../common/ServerCompatBanner';
 import ServerPushSetupBanner from '../common/ServerPushSetupBanner';
+import { Icon } from '../common/Icons';
 
 const styles = createStyleSheet({
   wrapper: {
@@ -40,12 +41,13 @@ export default function HomeScreen(props: Props): Node {
   return (
     <View style={styles.wrapper}>
       <View style={styles.iconList}>
-        <TopTabButton
-          name="globe"
+        <TopTabButtonGeneral
           onPress={() => {
             dispatch(doNarrow(HOME_NARROW));
           }}
-        />
+        >
+          <Icon size={24} style={{ textAlign: 'center' }} color={BRAND_COLOR} name="globe" />
+        </TopTabButtonGeneral>
         <TopTabButton
           name="star"
           onPress={() => {

From 4a659c61dc46477ea4c5a9727aaa201281a1db9a Mon Sep 17 00:00:00 2001
From: Leslie Ngo <lesliengo@Leslies-MacBook-Air.local>
Date: Fri, 19 Aug 2022 20:12:33 -0700
Subject: [PATCH 2/2] homescreen_icon: Swap All-Messages icon from 'globe' to
 'list'.

to match mobile's All Messages icon with the one found in web Zulip.

Fixes: #5303
---
 src/common/Icons.js    | 1 +
 src/main/HomeScreen.js | 4 ++--
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/src/common/Icons.js b/src/common/Icons.js
index 051066e966a..952af8ea9b4 100644
--- a/src/common/Icons.js
+++ b/src/common/Icons.js
@@ -108,3 +108,4 @@ export const IconGroup: SpecificIconType = makeIcon(FontAwesome, 'group');
 export const IconPlus: SpecificIconType = makeIcon(Feather, 'plus');
 // eslint-disable-next-line react/function-component-definition
 export const IconWebPublic: SpecificIconType = props => <ZulipIcon name="globe" {...props} />;
+export const IconAllMessages: SpecificIconType = makeIcon(FontAwesome, 'align-left');
diff --git a/src/main/HomeScreen.js b/src/main/HomeScreen.js
index 64fe90e8413..4842dc533e1 100644
--- a/src/main/HomeScreen.js
+++ b/src/main/HomeScreen.js
@@ -16,7 +16,7 @@ import { BRAND_COLOR, createStyleSheet } from '../styles';
 import LoadingBanner from '../common/LoadingBanner';
 import ServerCompatBanner from '../common/ServerCompatBanner';
 import ServerPushSetupBanner from '../common/ServerPushSetupBanner';
-import { Icon } from '../common/Icons';
+import { IconAllMessages } from '../common/Icons';
 
 const styles = createStyleSheet({
   wrapper: {
@@ -46,7 +46,7 @@ export default function HomeScreen(props: Props): Node {
             dispatch(doNarrow(HOME_NARROW));
           }}
         >
-          <Icon size={24} style={{ textAlign: 'center' }} color={BRAND_COLOR} name="globe" />
+          <IconAllMessages size={24} style={{ textAlign: 'center' }} color={BRAND_COLOR} />
         </TopTabButtonGeneral>
         <TopTabButton
           name="star"