diff --git a/app/components/user_status/user_status.js b/app/components/user_status/user_status.js
index 6705b54ca..6753d3450 100644
--- a/app/components/user_status/user_status.js
+++ b/app/components/user_status/user_status.js
@@ -2,17 +2,20 @@
 // See License.txt for license information.
 
 import React, {PureComponent} from 'react';
+import {Image} from 'react-native';
 import PropTypes from 'prop-types';
 
 import {General} from 'mattermost-redux/constants';
-
-import {AwayIcon, DndIcon, OfflineIcon, OnlineIcon} from 'app/components/status_icons';
+import away from 'assets/images/status/away.png';
+import dnd from 'assets/images/status/dnd.png';
+import offline from 'assets/images/status/offline.png';
+import online from 'assets/images/status/online.png';
 
 const statusToIcon = {
-    away: AwayIcon,
-    dnd: DndIcon,
-    offline: OfflineIcon,
-    online: OnlineIcon,
+    away,
+    dnd,
+    offline,
+    online,
 };
 
 export default class UserStatus extends PureComponent {
@@ -48,10 +51,9 @@ export default class UserStatus extends PureComponent {
         }
 
         return (
-            <Icon
-                height={size}
-                width={size}
-                color={iconColor}
+            <Image
+                source={Icon}
+                style={{height: size, width: size, tintColor: iconColor}}
             />
         );
     }
diff --git a/assets/base/images/status/away.png b/assets/base/images/status/away.png
new file mode 100644
index 000000000..498959962
Binary files /dev/null and b/assets/base/images/status/away.png differ
diff --git a/assets/base/images/status/dnd.png b/assets/base/images/status/dnd.png
new file mode 100644
index 000000000..a312f385a
Binary files /dev/null and b/assets/base/images/status/dnd.png differ
diff --git a/assets/base/images/status/offline.png b/assets/base/images/status/offline.png
new file mode 100644
index 000000000..8f08a3421
Binary files /dev/null and b/assets/base/images/status/offline.png differ
diff --git a/assets/base/images/status/online.png b/assets/base/images/status/online.png
new file mode 100644
index 000000000..8e257ce03
Binary files /dev/null and b/assets/base/images/status/online.png differ