diff --git a/app/components/channel_drawer/teams_list/teams_list_item/teams_list_item.js b/app/components/channel_drawer/teams_list/teams_list_item/teams_list_item.js
index a0ec8e523..319e9e38c 100644
--- a/app/components/channel_drawer/teams_list/teams_list_item/teams_list_item.js
+++ b/app/components/channel_drawer/teams_list/teams_list_item/teams_list_item.js
@@ -136,7 +136,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
             fontSize: 12,
         },
         imageContainer: {
-            backgroundColor: theme.sidebarBg,
+            backgroundColor: '#ffffff',
         },
         checkmarkContainer: {
             alignItems: 'flex-end',
diff --git a/app/components/team_icon/team_icon.js b/app/components/team_icon/team_icon.js
index 4373803e1..ff43c4cfa 100644
--- a/app/components/team_icon/team_icon.js
+++ b/app/components/team_icon/team_icon.js
@@ -5,15 +5,17 @@ import React from 'react';
 import PropTypes from 'prop-types';
 
 import {
-    Text,
     Image,
+    Platform,
+    Text,
     View,
 } from 'react-native';
 
-import {makeStyleSheetFromTheme} from 'app/utils/theme';
-
 import {Client4} from 'mattermost-redux/client';
 
+import ImageCacheManager from 'app/utils/image_cache_manager';
+import {makeStyleSheetFromTheme} from 'app/utils/theme';
+
 export default class TeamIcon extends React.PureComponent {
     static propTypes = {
         teamId: PropTypes.string.isRequired, // eslint-disable-line react/no-unused-prop-types
@@ -24,14 +26,38 @@ export default class TeamIcon extends React.PureComponent {
         theme: PropTypes.object.isRequired,
     };
 
-    state = {
-        imageError: false,
-    };
+    constructor(props) {
+        super(props);
 
-    componentWillReceiveProps() {
-        this.setState({imageError: false});
+        const {team} = props;
+        if (team.last_team_icon_update) {
+            ImageCacheManager.cache('', Client4.getTeamIconUrl(team.id, team.last_team_icon_update), this.setImageURL);
+        }
+
+        this.state = {
+            teamIcon: null,
+            imageError: false,
+        };
     }
 
+    componentWillReceiveProps(nextProps) {
+        this.setState({imageError: false});
+
+        if (this.props.team.last_team_icon_update !== nextProps.team.last_team_icon_update) {
+            const {team} = nextProps;
+            ImageCacheManager.cache('', Client4.getTeamIconUrl(team.id, team.last_team_icon_update), this.setImageURL);
+        }
+    }
+
+    setImageURL = (teamIcon) => {
+        let prefix = '';
+        if (Platform.OS === 'android') {
+            prefix = 'file://';
+        }
+
+        this.setState({teamIcon: `${prefix}${teamIcon}`});
+    };
+
     render() {
         const {
             team,
@@ -44,12 +70,11 @@ export default class TeamIcon extends React.PureComponent {
         const styles = getStyleSheet(theme);
 
         let teamIconContent;
-        if (team.last_team_icon_update && !this.state.imageError) {
-            const teamIconUrl = Client4.getTeamIconUrl(team.id, team.last_team_icon_update);
+        if (this.state.teamIcon) {
             teamIconContent = (
                 <Image
                     style={[styles.image, styleImage]}
-                    source={{uri: teamIconUrl, headers: {Authorization: `Bearer ${Client4.getToken()}`}}}
+                    source={{uri: this.state.teamIcon}}
                     onError={() => this.setState({imageError: true})}
                 />
             );
diff --git a/share_extension/android/extension_teams/team_item/team_item.js b/share_extension/android/extension_teams/team_item/team_item.js
index 27fd42622..69ad457ff 100644
--- a/share_extension/android/extension_teams/team_item/team_item.js
+++ b/share_extension/android/extension_teams/team_item/team_item.js
@@ -104,7 +104,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
             color: theme.sidebarText,
         },
         imageContainer: {
-            backgroundColor: theme.centerChannelBg,
+            backgroundColor: '#ffffff',
         },
         checkmarkContainer: {
             alignItems: 'flex-end',
diff --git a/share_extension/ios/extension_team_item.js b/share_extension/ios/extension_team_item.js
index 27f289f66..9632673f8 100644
--- a/share_extension/ios/extension_team_item.js
+++ b/share_extension/ios/extension_team_item.js
@@ -106,7 +106,7 @@ const getStyleSheet = makeStyleSheetFromTheme((theme) => {
             color: theme.sidebarText,
         },
         imageContainer: {
-            backgroundColor: theme.centerChannelBg,
+            backgroundColor: '#ffffff',
         },
         checkmarkContainer: {
             alignItems: 'flex-end',