diff --git a/app/src/main/java/awais/instagrabber/adapters/DiscoverAdapter.java b/app/src/main/java/awais/instagrabber/adapters/DiscoverAdapter.java
index fd1e7b1f..5a1af57e 100755
--- a/app/src/main/java/awais/instagrabber/adapters/DiscoverAdapter.java
+++ b/app/src/main/java/awais/instagrabber/adapters/DiscoverAdapter.java
@@ -47,8 +47,9 @@ public final class DiscoverAdapter extends MultiSelectListAdapter<DiscoverItemMo
             holder.itemView.setOnClickListener(v -> getInternalOnItemClickListener().onItemClick(itemModel, position));
             holder.itemView.setOnLongClickListener(v -> getInternalOnLongItemClickListener().onItemLongClick(itemModel, position));
             final MediaItemType mediaType = itemModel.getItemType();
-            holder.typeIcon.setVisibility(mediaType == MediaItemType.MEDIA_TYPE_VIDEO || mediaType == MediaItemType.MEDIA_TYPE_SLIDER ? View.VISIBLE : View.GONE);
-            holder.typeIcon.setImageResource(mediaType == MediaItemType.MEDIA_TYPE_SLIDER ? R.drawable.slider : R.drawable.video);
+            holder.typeIcon.setVisibility(
+                    mediaType == MediaItemType.MEDIA_TYPE_VIDEO || mediaType == MediaItemType.MEDIA_TYPE_SLIDER ? View.VISIBLE : View.GONE);
+            holder.typeIcon.setImageResource(mediaType == MediaItemType.MEDIA_TYPE_SLIDER ? R.drawable.ic_slider_24 : R.drawable.ic_video_24);
             holder.selectedView.setVisibility(itemModel.isSelected() ? View.VISIBLE : View.GONE);
             holder.postImage.setImageURI(itemModel.getDisplayUrl());
         }
diff --git a/app/src/main/java/awais/instagrabber/adapters/viewholder/PostViewHolder.java b/app/src/main/java/awais/instagrabber/adapters/viewholder/PostViewHolder.java
index 01e614ba..39c1d61a 100755
--- a/app/src/main/java/awais/instagrabber/adapters/viewholder/PostViewHolder.java
+++ b/app/src/main/java/awais/instagrabber/adapters/viewholder/PostViewHolder.java
@@ -35,7 +35,7 @@ public final class PostViewHolder extends RecyclerView.ViewHolder {
         binding.isDownloaded.setVisibility(postModel.isDownloaded() ? View.VISIBLE : View.GONE);
 
         binding.typeIcon.setVisibility(itemType == MediaItemType.MEDIA_TYPE_VIDEO || isSlider ? View.VISIBLE : View.GONE);
-        binding.typeIcon.setImageResource(isSlider ? R.drawable.slider : R.drawable.video);
+        binding.typeIcon.setImageResource(isSlider ? R.drawable.ic_slider_24 : R.drawable.ic_video_24);
 
         binding.selectedView.setVisibility(postModel.isSelected() ? View.VISIBLE : View.GONE);
         binding.postImage.setImageURI(postModel.getThumbnailUrl());
diff --git a/app/src/main/java/thoughtbot/expandableadapter/GroupViewHolder.java b/app/src/main/java/thoughtbot/expandableadapter/GroupViewHolder.java
index 075174b6..c350c839 100755
--- a/app/src/main/java/thoughtbot/expandableadapter/GroupViewHolder.java
+++ b/app/src/main/java/thoughtbot/expandableadapter/GroupViewHolder.java
@@ -34,6 +34,6 @@ public class GroupViewHolder extends RecyclerView.ViewHolder implements View.OnC
     }
 
     public void toggle(final boolean expand) {
-        arrow.setImageResource(expand ? R.drawable.collapse : R.drawable.expand);
+        arrow.setImageResource(expand ? R.drawable.ic_keyboard_arrow_up_24 : R.drawable.ic_keyboard_arrow_down_24);
     }
 }
\ No newline at end of file
diff --git a/app/src/main/res/drawable-night/collapse.png b/app/src/main/res/drawable-night/collapse.png
deleted file mode 100755
index 933450eb..00000000
Binary files a/app/src/main/res/drawable-night/collapse.png and /dev/null differ
diff --git a/app/src/main/res/drawable-night/expand.png b/app/src/main/res/drawable-night/expand.png
deleted file mode 100755
index 4e0a2e62..00000000
Binary files a/app/src/main/res/drawable-night/expand.png and /dev/null differ
diff --git a/app/src/main/res/drawable/check.png b/app/src/main/res/drawable/check.png
deleted file mode 100644
index c0bb4bd6..00000000
Binary files a/app/src/main/res/drawable/check.png and /dev/null differ
diff --git a/app/src/main/res/drawable/collapse.png b/app/src/main/res/drawable/collapse.png
deleted file mode 100755
index 711da440..00000000
Binary files a/app/src/main/res/drawable/collapse.png and /dev/null differ
diff --git a/app/src/main/res/drawable/downloaded.png b/app/src/main/res/drawable/downloaded.png
deleted file mode 100755
index 5a08664a..00000000
Binary files a/app/src/main/res/drawable/downloaded.png and /dev/null differ
diff --git a/app/src/main/res/drawable/expand.png b/app/src/main/res/drawable/expand.png
deleted file mode 100755
index 97f0359f..00000000
Binary files a/app/src/main/res/drawable/expand.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_cloud_download_24.xml b/app/src/main/res/drawable/ic_cloud_download_24.xml
new file mode 100644
index 00000000..58832b1b
--- /dev/null
+++ b/app/src/main/res/drawable/ic_cloud_download_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:tint="?attr/colorControlNormal"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:pathData="M19.35,10.04C18.67,6.59 15.64,4 12,4 9.11,4 6.6,5.64 5.35,8.04 2.34,8.36 0,10.91 0,14c0,3.31 2.69,6 6,6h13c2.76,0 5,-2.24 5,-5 0,-2.64 -2.05,-4.78 -4.65,-4.96zM17,13l-5,5 -5,-5h3V9h4v4h3z" />
+</vector>
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_down_24.xml b/app/src/main/res/drawable/ic_keyboard_arrow_down_24.xml
new file mode 100644
index 00000000..884bee14
--- /dev/null
+++ b/app/src/main/res/drawable/ic_keyboard_arrow_down_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M7.41,8.59L12,13.17l4.59,-4.58L18,10l-6,6 -6,-6 1.41,-1.41z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_keyboard_arrow_up_24.xml b/app/src/main/res/drawable/ic_keyboard_arrow_up_24.xml
new file mode 100644
index 00000000..9b15755e
--- /dev/null
+++ b/app/src/main/res/drawable/ic_keyboard_arrow_up_24.xml
@@ -0,0 +1,10 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24"
+    android:tint="?attr/colorControlNormal">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M7.41,15.41L12,10.83l4.59,4.58L18,14l-6,-6 -6,6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_location.png b/app/src/main/res/drawable/ic_location.png
deleted file mode 100644
index 5d4d03e1..00000000
Binary files a/app/src/main/res/drawable/ic_location.png and /dev/null differ
diff --git a/app/src/main/res/drawable/ic_slider_24.xml b/app/src/main/res/drawable/ic_slider_24.xml
new file mode 100644
index 00000000..388792ac
--- /dev/null
+++ b/app/src/main/res/drawable/ic_slider_24.xml
@@ -0,0 +1,9 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+  <path
+      android:fillColor="@android:color/white"
+      android:pathData="M22,16L22,4c0,-1.1 -0.9,-2 -2,-2L8,2c-1.1,0 -2,0.9 -2,2v12c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2zM11,12l2.03,2.71L16,11l4,5L8,16l3,-4zM2,6v14c0,1.1 0.9,2 2,2h14v-2L4,20L4,6L2,6z"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_video_24.xml b/app/src/main/res/drawable/ic_video_24.xml
new file mode 100644
index 00000000..18b9cfc5
--- /dev/null
+++ b/app/src/main/res/drawable/ic_video_24.xml
@@ -0,0 +1,11 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android"
+    android:width="24dp"
+    android:height="24dp"
+    android:viewportWidth="24"
+    android:viewportHeight="24">
+    <path
+        android:fillColor="@android:color/white"
+        android:strokeColor="@color/black"
+        android:strokeWidth="0.2"
+        android:pathData="M8,6.82v10.36c0,0.79 0.87,1.27 1.54,0.84l8.14,-5.18c0.62,-0.39 0.62,-1.29 0,-1.69L9.54,5.98C8.87,5.55 8,6.03 8,6.82z" />
+</vector>
diff --git a/app/src/main/res/drawable/slider.png b/app/src/main/res/drawable/slider.png
deleted file mode 100644
index 4566b8ba..00000000
Binary files a/app/src/main/res/drawable/slider.png and /dev/null differ
diff --git a/app/src/main/res/drawable/video.png b/app/src/main/res/drawable/video.png
deleted file mode 100644
index ebbe1296..00000000
Binary files a/app/src/main/res/drawable/video.png and /dev/null differ
diff --git a/app/src/main/res/drawable/zzz_adm.png b/app/src/main/res/drawable/zzz_adm.png
deleted file mode 100644
index 0a69734b..00000000
Binary files a/app/src/main/res/drawable/zzz_adm.png and /dev/null differ
diff --git a/app/src/main/res/drawable/zzz_lw.png b/app/src/main/res/drawable/zzz_lw.png
deleted file mode 100644
index 8d92f78f..00000000
Binary files a/app/src/main/res/drawable/zzz_lw.png and /dev/null differ
diff --git a/app/src/main/res/drawable/zzz_ms.png b/app/src/main/res/drawable/zzz_ms.png
deleted file mode 100644
index 5be93b00..00000000
Binary files a/app/src/main/res/drawable/zzz_ms.png and /dev/null differ
diff --git a/app/src/main/res/drawable/zzz_qdb.png b/app/src/main/res/drawable/zzz_qdb.png
deleted file mode 100644
index fe876685..00000000
Binary files a/app/src/main/res/drawable/zzz_qdb.png and /dev/null differ
diff --git a/app/src/main/res/drawable/zzz_rev.png b/app/src/main/res/drawable/zzz_rev.png
deleted file mode 100644
index 2a451bc5..00000000
Binary files a/app/src/main/res/drawable/zzz_rev.png and /dev/null differ
diff --git a/app/src/main/res/drawable/zzz_revl.png b/app/src/main/res/drawable/zzz_revl.png
deleted file mode 100644
index 2dbfdfb9..00000000
Binary files a/app/src/main/res/drawable/zzz_revl.png and /dev/null differ
diff --git a/app/src/main/res/drawable/zzz_tesv.png b/app/src/main/res/drawable/zzz_tesv.png
deleted file mode 100644
index d0c84e61..00000000
Binary files a/app/src/main/res/drawable/zzz_tesv.png and /dev/null differ
diff --git a/app/src/main/res/layout/header_follow.xml b/app/src/main/res/layout/header_follow.xml
index 243e2032..7f095d14 100755
--- a/app/src/main/res/layout/header_follow.xml
+++ b/app/src/main/res/layout/header_follow.xml
@@ -1,5 +1,6 @@
 <?xml version="1.0" encoding="utf-8"?>
 <RelativeLayout xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
@@ -21,7 +22,7 @@
         android:textAppearance="?android:attr/textAppearanceMedium"
         android:textStyle="bold" />
 
-    <ImageView
+    <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/collapsingArrow"
         android:layout_width="32dp"
         android:layout_height="match_parent"
@@ -32,5 +33,5 @@
         android:layout_marginEnd="3dp"
         android:layout_marginRight="3dp"
         android:contentDescription="@null"
-        android:src="@drawable/expand" />
+        app:srcCompat="@drawable/ic_keyboard_arrow_down_24" />
 </RelativeLayout>
diff --git a/app/src/main/res/layout/item_child_post.xml b/app/src/main/res/layout/item_child_post.xml
index 90c2174e..a4bc5efc 100755
--- a/app/src/main/res/layout/item_child_post.xml
+++ b/app/src/main/res/layout/item_child_post.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="@dimen/slider_item_size"
     android:layout_height="@dimen/slider_item_size"
     android:layout_marginStart="2dp"
@@ -23,7 +24,9 @@
         android:layout_width="24dp"
         android:layout_height="24dp"
         android:visibility="gone"
-        app:srcCompat="@drawable/downloaded" />
+        app:srcCompat="@drawable/ic_cloud_download_24"
+        app:tint="@color/green_400"
+        tools:visibility="visible" />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/selectedView"
diff --git a/app/src/main/res/layout/item_feed_slider.xml b/app/src/main/res/layout/item_feed_slider.xml
index 782c8bfa..a6b31978 100755
--- a/app/src/main/res/layout/item_feed_slider.xml
+++ b/app/src/main/res/layout/item_feed_slider.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:orientation="vertical">
@@ -16,25 +17,26 @@
         <androidx.viewpager.widget.ViewPager
             android:id="@+id/media_list"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content" />
+            android:layout_height="wrap_content"
+            tools:background="@color/semi_transparent_black" />
 
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="24dp"
             android:layout_height="24dp"
             android:layout_gravity="end|top"
             android:layout_margin="8dp"
-            app:srcCompat="@drawable/slider" />
+            app:srcCompat="@drawable/ic_slider_24" />
 
         <androidx.appcompat.widget.AppCompatTextView
             android:id="@+id/mediaCounter"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
             android:layout_gravity="center_horizontal|bottom"
+            android:background="@drawable/rounder_corner_semi_black_bg"
             android:gravity="center"
             android:padding="5dp"
-            android:textColor="@android:color/white"
-            android:background="@drawable/rounder_corner_semi_black_bg"
-            android:textAppearance="@style/TextAppearance.AppCompat.Caption"/>
+            android:textAppearance="@style/TextAppearance.AppCompat.Caption"
+            android:textColor="@android:color/white" />
     </FrameLayout>
 
     <include
diff --git a/app/src/main/res/layout/item_post.xml b/app/src/main/res/layout/item_post.xml
index 077c3666..1df80ac9 100755
--- a/app/src/main/res/layout/item_post.xml
+++ b/app/src/main/res/layout/item_post.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <FrameLayout xmlns:android="http://schemas.android.com/apk/res/android"
     xmlns:app="http://schemas.android.com/apk/res-auto"
+    xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:foreground="?android:selectableItemBackground">
@@ -10,7 +11,8 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         app:actualImageScaleType="centerCrop"
-        app:viewAspectRatio="1"/>
+        app:viewAspectRatio="1"
+        tools:background="@mipmap/ic_launcher" />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/isDownloaded"
@@ -19,7 +21,9 @@
         android:layout_gravity="start|top"
         android:layout_margin="8dp"
         android:visibility="gone"
-        app:srcCompat="@drawable/downloaded" />
+        app:srcCompat="@drawable/ic_cloud_download_24"
+        app:tint="@color/green_400"
+        tools:visibility="gone" />
 
     <androidx.appcompat.widget.AppCompatImageView
         android:id="@+id/typeIcon"
@@ -27,7 +31,8 @@
         android:layout_height="24dp"
         android:layout_gravity="end|top"
         android:layout_margin="8dp"
-        app:srcCompat="@drawable/video" />
+        app:srcCompat="@drawable/ic_video_24"
+        tools:visibility="visible" />
 
     <!--<ProgressBar-->
     <!--    android:id="@+id/progressView"-->
@@ -41,13 +46,16 @@
         android:layout_width="match_parent"
         android:layout_height="match_parent"
         android:background="#8A000000"
-        android:visibility="gone">
+        android:visibility="gone"
+        tools:visibility="gone">
 
         <androidx.appcompat.widget.AppCompatImageView
             android:layout_width="28dp"
             android:layout_height="28dp"
             android:layout_gravity="end|top"
             android:layout_margin="8dp"
-            app:srcCompat="@drawable/check" />
+            app:srcCompat="@drawable/ic_check_24"
+            app:tint="@color/blue_300"
+            tools:visibility="visible" />
     </FrameLayout>
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_dm_media.xml b/app/src/main/res/layout/layout_dm_media.xml
index 76894e52..a53b59cb 100644
--- a/app/src/main/res/layout/layout_dm_media.xml
+++ b/app/src/main/res/layout/layout_dm_media.xml
@@ -17,5 +17,5 @@
         android:layout_height="24dp"
         android:layout_gravity="end|top"
         android:layout_margin="8dp"
-        app:srcCompat="@drawable/video" />
+        app:srcCompat="@drawable/ic_video_24" />
 </FrameLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_dm_media_share.xml b/app/src/main/res/layout/layout_dm_media_share.xml
index 51fcaae1..49c20a74 100644
--- a/app/src/main/res/layout/layout_dm_media_share.xml
+++ b/app/src/main/res/layout/layout_dm_media_share.xml
@@ -31,6 +31,6 @@
             android:layout_height="24dp"
             android:layout_gravity="end|top"
             android:layout_margin="8dp"
-            app:srcCompat="@drawable/video" />
+            app:srcCompat="@drawable/ic_video_24" />
     </FrameLayout>
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/layout_dm_raven_media.xml b/app/src/main/res/layout/layout_dm_raven_media.xml
index fdffe6a9..6eda3942 100644
--- a/app/src/main/res/layout/layout_dm_raven_media.xml
+++ b/app/src/main/res/layout/layout_dm_raven_media.xml
@@ -29,7 +29,7 @@
             android:layout_height="24dp"
             android:layout_gravity="end|top"
             android:layout_margin="8dp"
-            app:srcCompat="@drawable/video" />
+            app:srcCompat="@drawable/ic_video_24" />
     </FrameLayout>
 
     <awais.instagrabber.customviews.RamboTextView
diff --git a/app/src/main/res/layout/layout_dm_story_share.xml b/app/src/main/res/layout/layout_dm_story_share.xml
index e389c6fb..beaf49f8 100644
--- a/app/src/main/res/layout/layout_dm_story_share.xml
+++ b/app/src/main/res/layout/layout_dm_story_share.xml
@@ -23,7 +23,7 @@
             android:layout_gravity="end|top"
             android:layout_margin="8dp"
             android:visibility="gone"
-            app:srcCompat="@drawable/video" />
+            app:srcCompat="@drawable/ic_video_24" />
     </FrameLayout>
 
     <awais.instagrabber.customviews.RamboTextView
diff --git a/app/src/main/res/values/color.xml b/app/src/main/res/values/color.xml
index 49e42c8d..d418393d 100755
--- a/app/src/main/res/values/color.xml
+++ b/app/src/main/res/values/color.xml
@@ -65,4 +65,6 @@
     <color name="blue_A200">#448AFF</color>
     <color name="blue_A400">#2979FF</color>
     <color name="blue_A700">#2962FF</color>
+
+    <color name="green_400">#66BB6A</color>
 </resources>
\ No newline at end of file