diff --git a/android/app/src/official/res/drawable-hdpi/disclosure_indicator.png b/android/app/src/official/res/drawable-hdpi/disclosure_indicator.png
deleted file mode 100644
index 9f6fd1dab..000000000
Binary files a/android/app/src/official/res/drawable-hdpi/disclosure_indicator.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-hdpi/disclosure_indicator_server.png b/android/app/src/official/res/drawable-hdpi/disclosure_indicator_server.png
deleted file mode 100644
index 287976ba3..000000000
Binary files a/android/app/src/official/res/drawable-hdpi/disclosure_indicator_server.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-hdpi/hashtag.png b/android/app/src/official/res/drawable-hdpi/hashtag.png
deleted file mode 100644
index 5d4be58c7..000000000
Binary files a/android/app/src/official/res/drawable-hdpi/hashtag.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-hdpi/livechat.png b/android/app/src/official/res/drawable-hdpi/livechat.png
deleted file mode 100644
index b2190ca73..000000000
Binary files a/android/app/src/official/res/drawable-hdpi/livechat.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-hdpi/lock.png b/android/app/src/official/res/drawable-hdpi/lock.png
deleted file mode 100644
index 68537368f..000000000
Binary files a/android/app/src/official/res/drawable-hdpi/lock.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-hdpi/sort_activity.png b/android/app/src/official/res/drawable-hdpi/sort_activity.png
deleted file mode 100644
index 2be5be129..000000000
Binary files a/android/app/src/official/res/drawable-hdpi/sort_activity.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-mdpi/disclosure_indicator.png b/android/app/src/official/res/drawable-mdpi/disclosure_indicator.png
deleted file mode 100644
index 42caa0676..000000000
Binary files a/android/app/src/official/res/drawable-mdpi/disclosure_indicator.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-mdpi/disclosure_indicator_server.png b/android/app/src/official/res/drawable-mdpi/disclosure_indicator_server.png
deleted file mode 100644
index 87923b2fc..000000000
Binary files a/android/app/src/official/res/drawable-mdpi/disclosure_indicator_server.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-mdpi/hashtag.png b/android/app/src/official/res/drawable-mdpi/hashtag.png
deleted file mode 100644
index e4a79ec30..000000000
Binary files a/android/app/src/official/res/drawable-mdpi/hashtag.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-mdpi/livechat.png b/android/app/src/official/res/drawable-mdpi/livechat.png
deleted file mode 100644
index 5047b8e50..000000000
Binary files a/android/app/src/official/res/drawable-mdpi/livechat.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-mdpi/lock.png b/android/app/src/official/res/drawable-mdpi/lock.png
deleted file mode 100644
index a87c44950..000000000
Binary files a/android/app/src/official/res/drawable-mdpi/lock.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-mdpi/sort_activity.png b/android/app/src/official/res/drawable-mdpi/sort_activity.png
deleted file mode 100644
index e64f442e5..000000000
Binary files a/android/app/src/official/res/drawable-mdpi/sort_activity.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-xhdpi/disclosure_indicator.png b/android/app/src/official/res/drawable-xhdpi/disclosure_indicator.png
deleted file mode 100644
index 585d4a797..000000000
Binary files a/android/app/src/official/res/drawable-xhdpi/disclosure_indicator.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-xhdpi/disclosure_indicator_server.png b/android/app/src/official/res/drawable-xhdpi/disclosure_indicator_server.png
deleted file mode 100644
index bed48962f..000000000
Binary files a/android/app/src/official/res/drawable-xhdpi/disclosure_indicator_server.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-xhdpi/hashtag.png b/android/app/src/official/res/drawable-xhdpi/hashtag.png
deleted file mode 100644
index d76738e3a..000000000
Binary files a/android/app/src/official/res/drawable-xhdpi/hashtag.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-xhdpi/livechat.png b/android/app/src/official/res/drawable-xhdpi/livechat.png
deleted file mode 100644
index 64e12138a..000000000
Binary files a/android/app/src/official/res/drawable-xhdpi/livechat.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-xhdpi/lock.png b/android/app/src/official/res/drawable-xhdpi/lock.png
deleted file mode 100644
index ba072523b..000000000
Binary files a/android/app/src/official/res/drawable-xhdpi/lock.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-xhdpi/sort_activity.png b/android/app/src/official/res/drawable-xhdpi/sort_activity.png
deleted file mode 100644
index 533d1aa63..000000000
Binary files a/android/app/src/official/res/drawable-xhdpi/sort_activity.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-xxhdpi/disclosure_indicator.png b/android/app/src/official/res/drawable-xxhdpi/disclosure_indicator.png
deleted file mode 100644
index 3c8634648..000000000
Binary files a/android/app/src/official/res/drawable-xxhdpi/disclosure_indicator.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-xxhdpi/disclosure_indicator_server.png b/android/app/src/official/res/drawable-xxhdpi/disclosure_indicator_server.png
deleted file mode 100644
index c0f6074d6..000000000
Binary files a/android/app/src/official/res/drawable-xxhdpi/disclosure_indicator_server.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-xxhdpi/hashtag.png b/android/app/src/official/res/drawable-xxhdpi/hashtag.png
deleted file mode 100644
index e083190f9..000000000
Binary files a/android/app/src/official/res/drawable-xxhdpi/hashtag.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-xxhdpi/livechat.png b/android/app/src/official/res/drawable-xxhdpi/livechat.png
deleted file mode 100644
index 14e8a801b..000000000
Binary files a/android/app/src/official/res/drawable-xxhdpi/livechat.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-xxhdpi/lock.png b/android/app/src/official/res/drawable-xxhdpi/lock.png
deleted file mode 100644
index 7b310acce..000000000
Binary files a/android/app/src/official/res/drawable-xxhdpi/lock.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-xxhdpi/sort_activity.png b/android/app/src/official/res/drawable-xxhdpi/sort_activity.png
deleted file mode 100644
index dac1d40e8..000000000
Binary files a/android/app/src/official/res/drawable-xxhdpi/sort_activity.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-xxxhdpi/disclosure_indicator.png b/android/app/src/official/res/drawable-xxxhdpi/disclosure_indicator.png
deleted file mode 100644
index d9a8f9079..000000000
Binary files a/android/app/src/official/res/drawable-xxxhdpi/disclosure_indicator.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-xxxhdpi/disclosure_indicator_server.png b/android/app/src/official/res/drawable-xxxhdpi/disclosure_indicator_server.png
deleted file mode 100644
index fa6f1db55..000000000
Binary files a/android/app/src/official/res/drawable-xxxhdpi/disclosure_indicator_server.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-xxxhdpi/hashtag.png b/android/app/src/official/res/drawable-xxxhdpi/hashtag.png
deleted file mode 100644
index c79e0c6ba..000000000
Binary files a/android/app/src/official/res/drawable-xxxhdpi/hashtag.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-xxxhdpi/livechat.png b/android/app/src/official/res/drawable-xxxhdpi/livechat.png
deleted file mode 100644
index 6cc6f9071..000000000
Binary files a/android/app/src/official/res/drawable-xxxhdpi/livechat.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-xxxhdpi/lock.png b/android/app/src/official/res/drawable-xxxhdpi/lock.png
deleted file mode 100644
index 0673b6aa8..000000000
Binary files a/android/app/src/official/res/drawable-xxxhdpi/lock.png and /dev/null differ
diff --git a/android/app/src/official/res/drawable-xxxhdpi/sort_activity.png b/android/app/src/official/res/drawable-xxxhdpi/sort_activity.png
deleted file mode 100644
index 1a8c76129..000000000
Binary files a/android/app/src/official/res/drawable-xxxhdpi/sort_activity.png and /dev/null differ
diff --git a/app/index.js b/app/index.js
index 21e336bcb..7c2cefa43 100644
--- a/app/index.js
+++ b/app/index.js
@@ -25,7 +25,7 @@ import { DimensionsContext } from './dimensions';
 import RocketChat, { THEME_PREFERENCES_KEY } from './lib/rocketchat';
 import { MIN_WIDTH_MASTER_DETAIL_LAYOUT } from './constants/tablet';
 import {
-	isTablet, supportSystemTheme
+	isTablet, supportSystemTheme, isAndroid
 } from './utils/deviceInfo';
 import { KEY_COMMAND } from './commands';
 import AppContainer from './AppContainer';