Continue changing vote button icons.

10 files changed, 618 insertions, 570 deletions

diff --git a/app/src/main/res/layout/item_post_card_2_gallery_type.xml b/app/src/main/res/layout/item_post_card_2_gallery_type.xml
index 1455d1fd..622d3876 100644
--- a/app/src/main/res/layout/item_post_card_2_gallery_type.xml
+++ b/app/src/main/res/layout/item_post_card_2_gallery_type.xml
@@ -216,87 +216,92 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/bottom_constraint_layout_item_post_card_2_gallery_type"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:id="@+id/upvote_button_item_post_card_2_gallery_type"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:src="@drawable/ic_arrow_upward_grey_24dp"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <TextView
-            android:id="@+id/score_text_view_item_post_card_2_gallery_type"
-            android:layout_width="64dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textSize="?attr/font_12"
-            android:textStyle="bold"
-            android:fontFamily="?attr/font_family"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/upvote_button_item_post_card_2_gallery_type" />
+        android:layout_height="wrap_content"
+        android:padding="8dp">
 
-        <ImageView
-            android:id="@+id/downvote_button_item_post_card_2_gallery_type"
-            android:layout_width="wrap_content"
+        <com.google.android.material.button.MaterialButtonToggleGroup
+            android:id="@+id/vote_button_toggle_item_post_card_2_gallery_type"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:src="@drawable/ic_arrow_downward_grey_24dp"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"
+            app:singleSelection="true"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_card_2_gallery_type" />
+            app:layout_constraintBottom_toBottomOf="parent">
 
-        <TextView
-            android:id="@+id/comments_count_text_view_item_post_card_2_gallery_type"
+            <com.google.android.material.button.MaterialButton
+                style="?attr/materialButtonOutlinedStyle"
+                android:id="@+id/upvote_button_item_post_card_2_gallery_type"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
+                android:textSize="?attr/font_12"
+                android:textStyle="bold"
+                android:fontFamily="?attr/font_family"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_upvote_24dp"
+                app:iconSize="24dp"
+                android:backgroundTint="#00000000" />
+
+            <com.google.android.material.button.MaterialButton
+                style="?attr/materialButtonOutlinedStyle"
+                android:id="@+id/downvote_button_item_post_card_2_gallery_type"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_downvote_24dp"
+                app:iconSize="24dp"
+                android:backgroundTint="#00000000" />
+
+        </com.google.android.material.button.MaterialButtonToggleGroup>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/comments_count_button_item_post_card_2_gallery_type"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:gravity="center_vertical"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
             android:textSize="?attr/font_12"
             android:textStyle="bold"
             android:fontFamily="?attr/font_family"
-            android:drawableStart="@drawable/ic_comment_grey_24dp"
-            android:drawablePadding="12dp"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_comment_grey_24dp"
+            app:iconTint="@null"
+            app:iconSize="24dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_card_2_gallery_type" />
+            app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_card_2_gallery_type"
+            style="?attr/materialIconButtonOutlinedStyle" />
 
-        <ImageView
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/save_button_item_post_card_2_gallery_type"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"
+            app:strokeWidth="0dp"
+            app:iconSize="24dp"
             app:layout_constraintHorizontal_bias="1"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/comments_count_text_view_item_post_card_2_gallery_type"
-            app:layout_constraintEnd_toStartOf="@id/share_button_item_post_card_2_gallery_type" />
+            app:layout_constraintStart_toEndOf="@id/comments_count_button_item_post_card_2_gallery_type"
+            app:layout_constraintEnd_toStartOf="@id/share_button_item_post_card_2_gallery_type"
+            style="?attr/materialIconButtonOutlinedStyle" />
 
-        <ImageView
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/share_button_item_post_card_2_gallery_type"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:src="@drawable/ic_share_grey_24dp"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_share_grey_24dp"
+            app:iconSize="24dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintEnd_toEndOf="parent"
+            style="?attr/materialIconButtonOutlinedStyle" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_post_card_2_text.xml b/app/src/main/res/layout/item_post_card_2_text.xml
index c70142c2..7a74d657 100644
--- a/app/src/main/res/layout/item_post_card_2_text.xml
+++ b/app/src/main/res/layout/item_post_card_2_text.xml
@@ -178,85 +178,89 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content">
 
-        <ImageView
-            android:id="@+id/plus_button_item_post_card_2_text"
-            android:layout_width="wrap_content"
+        <com.google.android.material.button.MaterialButtonToggleGroup
+            android:id="@+id/vote_button_toggle_item_post_card_2_text"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:src="@drawable/ic_arrow_upward_grey_24dp"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"
+            app:singleSelection="true"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
+            app:layout_constraintBottom_toBottomOf="parent">
 
-        <TextView
-            android:id="@+id/score_text_view_item_post_card_2_text"
-            android:layout_width="64dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textSize="?attr/font_12"
-            android:textStyle="bold"
-            android:fontFamily="?attr/font_family"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/plus_button_item_post_card_2_text" />
+            <com.google.android.material.button.MaterialButton
+                style="?attr/materialButtonOutlinedStyle"
+                android:id="@+id/upvote_button_item_post_card_2_text"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
+                android:textSize="?attr/font_12"
+                android:textStyle="bold"
+                android:fontFamily="?attr/font_family"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_upvote_24dp"
+                app:iconSize="24dp"
+                android:backgroundTint="#00000000" />
 
-        <ImageView
-            android:id="@+id/minus_button_item_post_card_2_text"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:src="@drawable/ic_arrow_downward_grey_24dp"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_card_2_text" />
+            <com.google.android.material.button.MaterialButton
+                style="?attr/materialButtonOutlinedStyle"
+                android:id="@+id/downvote_button_item_post_card_2_text"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_downvote_24dp"
+                app:iconSize="24dp"
+                android:backgroundTint="#00000000" />
 
-        <TextView
-            android:id="@+id/comments_count_item_post_card_2_text"
+        </com.google.android.material.button.MaterialButtonToggleGroup>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/comments_count_button_item_post_card_2_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:gravity="center_vertical"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
             android:textSize="?attr/font_12"
             android:textStyle="bold"
             android:fontFamily="?attr/font_family"
-            android:drawableStart="@drawable/ic_comment_grey_24dp"
-            android:drawablePadding="12dp"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_comment_grey_24dp"
+            app:iconTint="@null"
+            app:iconSize="24dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/minus_button_item_post_card_2_text" />
+            app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_card_2_text"
+            style="?attr/materialIconButtonOutlinedStyle" />
 
-        <ImageView
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/save_button_item_post_card_2_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"
+            app:strokeWidth="0dp"
+            app:iconSize="24dp"
             app:layout_constraintHorizontal_bias="1"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/comments_count_item_post_card_2_text"
-            app:layout_constraintEnd_toStartOf="@id/share_button_item_post_card_2_text" />
+            app:layout_constraintStart_toEndOf="@id/comments_count_button_item_post_card_2_text"
+            app:layout_constraintEnd_toStartOf="@id/share_button_item_post_card_2_text"
+            style="?attr/materialIconButtonOutlinedStyle" />
 
-        <ImageView
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/share_button_item_post_card_2_text"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:src="@drawable/ic_share_grey_24dp"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_share_grey_24dp"
+            app:iconSize="24dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintEnd_toEndOf="parent"
+            style="?attr/materialIconButtonOutlinedStyle" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_post_card_2_video_autoplay.xml b/app/src/main/res/layout/item_post_card_2_video_autoplay.xml
index 3f3cf37c..494ee4ad 100644
--- a/app/src/main/res/layout/item_post_card_2_video_autoplay.xml
+++ b/app/src/main/res/layout/item_post_card_2_video_autoplay.xml
@@ -217,87 +217,92 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/bottom_constraint_layout_item_post_card_2_video_autoplay"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:id="@+id/plus_button_item_post_card_2_video_autoplay"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:src="@drawable/ic_arrow_upward_grey_24dp"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <TextView
-            android:id="@+id/score_text_view_item_post_card_2_video_autoplay"
-            android:layout_width="64dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textSize="?attr/font_12"
-            android:textStyle="bold"
-            android:fontFamily="?attr/font_family"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/plus_button_item_post_card_2_video_autoplay" />
+        android:layout_height="wrap_content"
+        android:padding="8dp">
 
-        <ImageView
-            android:id="@+id/minus_button_item_post_card_2_video_autoplay"
-            android:layout_width="wrap_content"
+        <com.google.android.material.button.MaterialButtonToggleGroup
+            android:id="@+id/vote_button_toggle_item_post_card_2_video_autoplay"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:src="@drawable/ic_arrow_downward_grey_24dp"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"
+            app:singleSelection="true"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_card_2_video_autoplay" />
+            app:layout_constraintBottom_toBottomOf="parent">
 
-        <TextView
-            android:id="@+id/comments_count_item_post_card_2_video_autoplay"
+            <com.google.android.material.button.MaterialButton
+                style="?attr/materialButtonOutlinedStyle"
+                android:id="@+id/upvote_button_item_post_card_2_video_autoplay"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
+                android:textSize="?attr/font_12"
+                android:textStyle="bold"
+                android:fontFamily="?attr/font_family"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_upvote_24dp"
+                app:iconSize="24dp"
+                android:backgroundTint="#00000000" />
+
+            <com.google.android.material.button.MaterialButton
+                style="?attr/materialButtonOutlinedStyle"
+                android:id="@+id/downvote_button_item_post_card_2_video_autoplay"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_downvote_24dp"
+                app:iconSize="24dp"
+                android:backgroundTint="#00000000" />
+
+        </com.google.android.material.button.MaterialButtonToggleGroup>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/comments_count_button_item_post_card_2_video_autoplay"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:gravity="center_vertical"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
             android:textSize="?attr/font_12"
             android:textStyle="bold"
             android:fontFamily="?attr/font_family"
-            android:drawableStart="@drawable/ic_comment_grey_24dp"
-            android:drawablePadding="12dp"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_comment_grey_24dp"
+            app:iconTint="@null"
+            app:iconSize="24dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/minus_button_item_post_card_2_video_autoplay" />
+            app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_card_2_video_autoplay"
+            style="?attr/materialIconButtonOutlinedStyle" />
 
-        <ImageView
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/save_button_item_post_card_2_video_autoplay"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"
+            app:strokeWidth="0dp"
+            app:iconSize="24dp"
             app:layout_constraintHorizontal_bias="1"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/comments_count_item_post_card_2_video_autoplay"
-            app:layout_constraintEnd_toStartOf="@id/share_button_item_post_card_2_video_autoplay" />
+            app:layout_constraintStart_toEndOf="@id/comments_count_button_item_post_card_2_video_autoplay"
+            app:layout_constraintEnd_toStartOf="@id/share_button_item_post_card_2_video_autoplay"
+            style="?attr/materialIconButtonOutlinedStyle" />
 
-        <ImageView
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/share_button_item_post_card_2_video_autoplay"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:src="@drawable/ic_share_grey_24dp"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_share_grey_24dp"
+            app:iconSize="24dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintEnd_toEndOf="parent"
+            style="?attr/materialIconButtonOutlinedStyle" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml b/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml
index 002afb56..fcb36fb9 100644
--- a/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml
+++ b/app/src/main/res/layout/item_post_card_2_video_autoplay_legacy_controller.xml
@@ -217,87 +217,92 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/bottom_constraint_layout_item_post_card_2_video_autoplay"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:id="@+id/plus_button_item_post_card_2_video_autoplay"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:src="@drawable/ic_arrow_upward_grey_24dp"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <TextView
-            android:id="@+id/score_text_view_item_post_card_2_video_autoplay"
-            android:layout_width="64dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textSize="?attr/font_12"
-            android:textStyle="bold"
-            android:fontFamily="?attr/font_family"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/plus_button_item_post_card_2_video_autoplay" />
+        android:layout_height="wrap_content"
+        android:padding="8dp">
 
-        <ImageView
-            android:id="@+id/minus_button_item_post_card_2_video_autoplay"
-            android:layout_width="wrap_content"
+        <com.google.android.material.button.MaterialButtonToggleGroup
+            android:id="@+id/vote_button_toggle_item_post_card_2_video_autoplay"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:src="@drawable/ic_arrow_downward_grey_24dp"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"
+            app:singleSelection="true"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_card_2_video_autoplay" />
+            app:layout_constraintBottom_toBottomOf="parent">
 
-        <TextView
-            android:id="@+id/comments_count_item_post_card_2_video_autoplay"
+            <com.google.android.material.button.MaterialButton
+                style="?attr/materialButtonOutlinedStyle"
+                android:id="@+id/upvote_button_item_post_card_2_video_autoplay"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
+                android:textSize="?attr/font_12"
+                android:textStyle="bold"
+                android:fontFamily="?attr/font_family"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_upvote_24dp"
+                app:iconSize="24dp"
+                android:backgroundTint="#00000000" />
+
+            <com.google.android.material.button.MaterialButton
+                style="?attr/materialButtonOutlinedStyle"
+                android:id="@+id/downvote_button_item_post_card_2_video_autoplay"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_downvote_24dp"
+                app:iconSize="24dp"
+                android:backgroundTint="#00000000" />
+
+        </com.google.android.material.button.MaterialButtonToggleGroup>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/comments_count_button_item_post_card_2_video_autoplay"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:gravity="center_vertical"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
             android:textSize="?attr/font_12"
             android:textStyle="bold"
             android:fontFamily="?attr/font_family"
-            android:drawableStart="@drawable/ic_comment_grey_24dp"
-            android:drawablePadding="12dp"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_comment_grey_24dp"
+            app:iconTint="@null"
+            app:iconSize="24dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/minus_button_item_post_card_2_video_autoplay" />
+            app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_card_2_video_autoplay"
+            style="?attr/materialIconButtonOutlinedStyle" />
 
-        <ImageView
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/save_button_item_post_card_2_video_autoplay"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"
+            app:strokeWidth="0dp"
+            app:iconSize="24dp"
             app:layout_constraintHorizontal_bias="1"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/comments_count_item_post_card_2_video_autoplay"
-            app:layout_constraintEnd_toStartOf="@id/share_button_item_post_card_2_video_autoplay" />
+            app:layout_constraintStart_toEndOf="@id/comments_count_button_item_post_card_2_video_autoplay"
+            app:layout_constraintEnd_toStartOf="@id/share_button_item_post_card_2_video_autoplay"
+            style="?attr/materialIconButtonOutlinedStyle" />
 
-        <ImageView
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/share_button_item_post_card_2_video_autoplay"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:src="@drawable/ic_share_grey_24dp"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_share_grey_24dp"
+            app:iconSize="24dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintEnd_toEndOf="parent"
+            style="?attr/materialIconButtonOutlinedStyle" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_post_card_2_with_preview.xml b/app/src/main/res/layout/item_post_card_2_with_preview.xml
index eb67faac..07acf34f 100644
--- a/app/src/main/res/layout/item_post_card_2_with_preview.xml
+++ b/app/src/main/res/layout/item_post_card_2_with_preview.xml
@@ -228,87 +228,92 @@
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/bottom_constraint_layout_item_post_card_2_with_preview"
         android:layout_width="match_parent"
-        android:layout_height="wrap_content">
-
-        <ImageView
-            android:id="@+id/plus_button_item_post_card_2_with_preview"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:src="@drawable/ic_upvote_24dp"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toStartOf="parent" />
-
-        <TextView
-            android:id="@+id/score_text_view_item_post_card_2_with_preview"
-            android:layout_width="64dp"
-            android:layout_height="wrap_content"
-            android:gravity="center"
-            android:textSize="?attr/font_12"
-            android:textStyle="bold"
-            android:fontFamily="?attr/font_family"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/plus_button_item_post_card_2_with_preview" />
+        android:layout_height="wrap_content"
+        android:padding="8dp">
 
-        <ImageView
-            android:id="@+id/minus_button_item_post_card_2_with_preview"
-            android:layout_width="wrap_content"
+        <com.google.android.material.button.MaterialButtonToggleGroup
+            android:id="@+id/vote_button_toggle_item_post_card_2_with_preview"
+            android:layout_width="0dp"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:src="@drawable/ic_downvote_24dp"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"
+            app:singleSelection="true"
+            app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_card_2_with_preview" />
-
-        <TextView
-            android:id="@+id/comments_count_item_post_card_2_with_preview"
+            app:layout_constraintBottom_toBottomOf="parent">
+
+            <com.google.android.material.button.MaterialButton
+                style="?attr/materialButtonOutlinedStyle"
+                android:id="@+id/upvote_button_item_post_card_2_with_preview"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
+                android:textSize="?attr/font_12"
+                android:textStyle="bold"
+                android:fontFamily="?attr/font_family"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_upvote_24dp"
+                app:iconSize="24dp"
+                android:backgroundTint="#00000000" />
+
+            <com.google.android.material.button.MaterialButton
+                style="?attr/materialButtonOutlinedStyle"
+                android:id="@+id/downvote_button_item_post_card_2_with_preview"
+                android:layout_width="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_downvote_24dp"
+                app:iconSize="24dp"
+                android:backgroundTint="#00000000" />
+
+        </com.google.android.material.button.MaterialButtonToggleGroup>
+
+        <com.google.android.material.button.MaterialButton
+            android:id="@+id/comments_count_button_item_post_card_2_with_preview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:gravity="center_vertical"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
             android:textSize="?attr/font_12"
             android:textStyle="bold"
             android:fontFamily="?attr/font_family"
-            android:drawableStart="@drawable/ic_comment_grey_24dp"
-            android:drawablePadding="12dp"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_comment_grey_24dp"
+            app:iconTint="@null"
+            app:iconSize="24dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/minus_button_item_post_card_2_with_preview" />
+            app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_card_2_with_preview"
+            style="?attr/materialIconButtonOutlinedStyle" />
 
-        <ImageView
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/save_button_item_post_card_2_with_preview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"
+            app:strokeWidth="0dp"
+            app:iconSize="24dp"
             app:layout_constraintHorizontal_bias="1"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/comments_count_item_post_card_2_with_preview"
-            app:layout_constraintEnd_toStartOf="@id/share_button_item_post_card_2_with_preview" />
+            app:layout_constraintStart_toEndOf="@id/comments_count_button_item_post_card_2_with_preview"
+            app:layout_constraintEnd_toStartOf="@id/share_button_item_post_card_2_with_preview"
+            style="?attr/materialIconButtonOutlinedStyle" />
 
-        <ImageView
+        <com.google.android.material.button.MaterialButton
             android:id="@+id/share_button_item_post_card_2_with_preview"
             android:layout_width="wrap_content"
             android:layout_height="wrap_content"
-            android:padding="12dp"
-            android:src="@drawable/ic_share_grey_24dp"
-            android:background="?actionBarItemBackground"
-            android:clickable="true"
-            android:focusable="true"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_share_grey_24dp"
+            app:iconSize="24dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintEnd_toEndOf="parent" />
+            app:layout_constraintEnd_toEndOf="parent"
+            style="?attr/materialIconButtonOutlinedStyle" />
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_post_gallery_type.xml b/app/src/main/res/layout/item_post_gallery_type.xml
index 13bd9517..0a5712a9 100644
--- a/app/src/main/res/layout/item_post_gallery_type.xml
+++ b/app/src/main/res/layout/item_post_gallery_type.xml
@@ -233,87 +233,92 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/bottom_constraint_layout_item_post_gallery_type"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <ImageView
-                android:id="@+id/upvote_button_item_post_gallery_type"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:src="@drawable/ic_arrow_upward_grey_24dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <TextView
-                android:id="@+id/score_text_view_item_post_gallery_type"
-                android:layout_width="64dp"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:textSize="?attr/font_12"
-                android:textStyle="bold"
-                android:fontFamily="?attr/font_family"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/upvote_button_item_post_gallery_type" />
+            android:layout_height="wrap_content"
+            android:padding="8dp">
 
-            <ImageView
-                android:id="@+id/downvote_button_item_post_gallery_type"
-                android:layout_width="wrap_content"
+            <com.google.android.material.button.MaterialButtonToggleGroup
+                android:id="@+id/vote_button_toggle_item_post_gallery_type"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:src="@drawable/ic_arrow_downward_grey_24dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
+                app:singleSelection="true"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_gallery_type" />
-
-            <TextView
-                android:id="@+id/comments_count_text_view_item_post_gallery_type"
+                app:layout_constraintBottom_toBottomOf="parent">
+
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:id="@+id/upvote_button_item_post_gallery_type"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
+                    android:minWidth="0dp"
+                    android:textSize="?attr/font_12"
+                    android:textStyle="bold"
+                    android:fontFamily="?attr/font_family"
+                    app:strokeWidth="0dp"
+                    app:icon="@drawable/ic_upvote_24dp"
+                    app:iconSize="24dp"
+                    android:backgroundTint="#00000000" />
+
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:id="@+id/downvote_button_item_post_gallery_type"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
+                    android:minWidth="0dp"
+                    app:strokeWidth="0dp"
+                    app:icon="@drawable/ic_downvote_24dp"
+                    app:iconSize="24dp"
+                    android:backgroundTint="#00000000" />
+
+            </com.google.android.material.button.MaterialButtonToggleGroup>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/comments_count_button_item_post_gallery_type"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:gravity="center_vertical"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
                 android:textSize="?attr/font_12"
                 android:textStyle="bold"
                 android:fontFamily="?attr/font_family"
-                android:drawableStart="@drawable/ic_comment_grey_24dp"
-                android:drawablePadding="12dp"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_comment_grey_24dp"
+                app:iconTint="@null"
+                app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_gallery_type" />
+                app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_gallery_type"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
-            <ImageView
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/save_button_item_post_gallery_type"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
+                app:strokeWidth="0dp"
+                app:iconSize="24dp"
                 app:layout_constraintHorizontal_bias="1"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/comments_count_text_view_item_post_gallery_type"
-                app:layout_constraintEnd_toStartOf="@id/share_button_item_post_gallery_type" />
+                app:layout_constraintStart_toEndOf="@id/comments_count_button_item_post_gallery_type"
+                app:layout_constraintEnd_toStartOf="@id/share_button_item_post_gallery_type"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
-            <ImageView
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/share_button_item_post_gallery_type"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:src="@drawable/ic_share_grey_24dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_share_grey_24dp"
+                app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" />
+                app:layout_constraintEnd_toEndOf="parent"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_post_text.xml b/app/src/main/res/layout/item_post_text.xml
index 3b2ca0f3..68b2a551 100644
--- a/app/src/main/res/layout/item_post_text.xml
+++ b/app/src/main/res/layout/item_post_text.xml
@@ -212,87 +212,92 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/bottom_constraint_layout_item_post_text_type"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
+            android:layout_height="wrap_content"
+            android:padding="8dp">
 
-            <ImageView
-                android:id="@+id/plus_button_item_post_text_type"
-                android:layout_width="wrap_content"
+            <com.google.android.material.button.MaterialButtonToggleGroup
+                android:id="@+id/vote_button_toggle_item_post_text_type"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:src="@drawable/ic_arrow_upward_grey_24dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
+                app:singleSelection="true"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
+                app:layout_constraintBottom_toBottomOf="parent">
 
-            <TextView
-                android:id="@+id/score_text_view_item_post_text_type"
-                android:layout_width="64dp"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:textSize="?attr/font_12"
-                android:fontFamily="?attr/font_family"
-                android:textStyle="bold"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/plus_button_item_post_text_type" />
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:id="@+id/upvote_button_item_post_text_type"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
+                    android:minWidth="0dp"
+                    android:textSize="?attr/font_12"
+                    android:textStyle="bold"
+                    android:fontFamily="?attr/font_family"
+                    app:strokeWidth="0dp"
+                    app:icon="@drawable/ic_upvote_24dp"
+                    app:iconSize="24dp"
+                    android:backgroundTint="#00000000" />
 
-            <ImageView
-                android:id="@+id/minus_button_item_post_text_type"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:src="@drawable/ic_arrow_downward_grey_24dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_text_type" />
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:id="@+id/downvote_button_item_post_text_type"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
+                    android:minWidth="0dp"
+                    app:strokeWidth="0dp"
+                    app:icon="@drawable/ic_downvote_24dp"
+                    app:iconSize="24dp"
+                    android:backgroundTint="#00000000" />
 
-            <TextView
-                android:id="@+id/comments_count_item_post_text_type"
+            </com.google.android.material.button.MaterialButtonToggleGroup>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/comments_count_button_item_post_text_type"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:gravity="center_vertical"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
                 android:textSize="?attr/font_12"
-                android:fontFamily="?attr/font_family"
                 android:textStyle="bold"
-                android:drawableStart="@drawable/ic_comment_grey_24dp"
-                android:drawablePadding="12dp"
+                android:fontFamily="?attr/font_family"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_comment_grey_24dp"
+                app:iconTint="@null"
+                app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/minus_button_item_post_text_type" />
+                app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_text_type"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
-            <ImageView
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/save_button_item_post_text_type"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
+                app:strokeWidth="0dp"
+                app:iconSize="24dp"
                 app:layout_constraintHorizontal_bias="1"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/comments_count_item_post_text_type"
-                app:layout_constraintEnd_toStartOf="@id/share_button_item_post_text_type" />
+                app:layout_constraintStart_toEndOf="@id/comments_count_button_item_post_text_type"
+                app:layout_constraintEnd_toStartOf="@id/share_button_item_post_text_type"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
-            <ImageView
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/share_button_item_post_text_type"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:src="@drawable/ic_share_grey_24dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_share_grey_24dp"
+                app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" />
+                app:layout_constraintEnd_toEndOf="parent"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_post_video_type_autoplay.xml b/app/src/main/res/layout/item_post_video_type_autoplay.xml
index b63b608e..24db9673 100644
--- a/app/src/main/res/layout/item_post_video_type_autoplay.xml
+++ b/app/src/main/res/layout/item_post_video_type_autoplay.xml
@@ -233,87 +233,92 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/bottom_constraint_layout_item_post_video_type_autoplay"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <ImageView
-                android:id="@+id/plus_button_item_post_video_type_autoplay"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:src="@drawable/ic_arrow_upward_grey_24dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <TextView
-                android:id="@+id/score_text_view_item_post_video_type_autoplay"
-                android:layout_width="64dp"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:textSize="?attr/font_12"
-                android:textStyle="bold"
-                android:fontFamily="?attr/font_family"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/plus_button_item_post_video_type_autoplay" />
+            android:layout_height="wrap_content"
+            android:padding="8dp">
 
-            <ImageView
-                android:id="@+id/minus_button_item_post_video_type_autoplay"
-                android:layout_width="wrap_content"
+            <com.google.android.material.button.MaterialButtonToggleGroup
+                android:id="@+id/vote_button_toggle_item_post_video_type_autoplay"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:src="@drawable/ic_arrow_downward_grey_24dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
+                app:singleSelection="true"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_video_type_autoplay" />
-
-            <TextView
-                android:id="@+id/comments_count_item_post_video_type_autoplay"
+                app:layout_constraintBottom_toBottomOf="parent">
+
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:id="@+id/upvote_button_item_post_video_type_autoplay"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
+                    android:minWidth="0dp"
+                    android:textSize="?attr/font_12"
+                    android:textStyle="bold"
+                    android:fontFamily="?attr/font_family"
+                    app:strokeWidth="0dp"
+                    app:icon="@drawable/ic_upvote_24dp"
+                    app:iconSize="24dp"
+                    android:backgroundTint="#00000000" />
+
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:id="@+id/downvote_button_item_post_video_type_autoplay"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
+                    android:minWidth="0dp"
+                    app:strokeWidth="0dp"
+                    app:icon="@drawable/ic_downvote_24dp"
+                    app:iconSize="24dp"
+                    android:backgroundTint="#00000000" />
+
+            </com.google.android.material.button.MaterialButtonToggleGroup>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/comments_count_button_item_post_video_type_autoplay"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:gravity="center_vertical"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
                 android:textSize="?attr/font_12"
                 android:textStyle="bold"
                 android:fontFamily="?attr/font_family"
-                android:drawableStart="@drawable/ic_comment_grey_24dp"
-                android:drawablePadding="12dp"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_comment_grey_24dp"
+                app:iconTint="@null"
+                app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/minus_button_item_post_video_type_autoplay" />
+                app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_video_type_autoplay"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
-            <ImageView
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/save_button_item_post_video_type_autoplay"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
+                app:strokeWidth="0dp"
+                app:iconSize="24dp"
                 app:layout_constraintHorizontal_bias="1"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/comments_count_item_post_video_type_autoplay"
-                app:layout_constraintEnd_toStartOf="@id/share_button_item_post_video_type_autoplay" />
+                app:layout_constraintStart_toEndOf="@id/comments_count_button_item_post_video_type_autoplay"
+                app:layout_constraintEnd_toStartOf="@id/share_button_item_post_video_type_autoplay"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
-            <ImageView
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/share_button_item_post_video_type_autoplay"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:src="@drawable/ic_share_grey_24dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_share_grey_24dp"
+                app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" />
+                app:layout_constraintEnd_toEndOf="parent"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml b/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml
index 6dc38374..2e34ec50 100644
--- a/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml
+++ b/app/src/main/res/layout/item_post_video_type_autoplay_legacy_controller.xml
@@ -235,85 +235,89 @@
             android:layout_width="match_parent"
             android:layout_height="wrap_content">
 
-            <ImageView
-                android:id="@+id/plus_button_item_post_video_type_autoplay"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:src="@drawable/ic_arrow_upward_grey_24dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <TextView
-                android:id="@+id/score_text_view_item_post_video_type_autoplay"
-                android:layout_width="64dp"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:textSize="?attr/font_12"
-                android:textStyle="bold"
-                android:fontFamily="?attr/font_family"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/plus_button_item_post_video_type_autoplay" />
-
-            <ImageView
-                android:id="@+id/minus_button_item_post_video_type_autoplay"
-                android:layout_width="wrap_content"
+            <com.google.android.material.button.MaterialButtonToggleGroup
+                android:id="@+id/vote_button_toggle_item_post_video_type_autoplay"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:src="@drawable/ic_arrow_downward_grey_24dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
+                app:singleSelection="true"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_video_type_autoplay" />
-
-            <TextView
-                android:id="@+id/comments_count_item_post_video_type_autoplay"
+                app:layout_constraintBottom_toBottomOf="parent">
+
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:id="@+id/upvote_button_item_post_video_type_autoplay"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
+                    android:minWidth="0dp"
+                    android:textSize="?attr/font_12"
+                    android:textStyle="bold"
+                    android:fontFamily="?attr/font_family"
+                    app:strokeWidth="0dp"
+                    app:icon="@drawable/ic_upvote_24dp"
+                    app:iconSize="24dp"
+                    android:backgroundTint="#00000000" />
+
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:id="@+id/downvote_button_item_post_video_type_autoplay"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
+                    android:minWidth="0dp"
+                    app:strokeWidth="0dp"
+                    app:icon="@drawable/ic_downvote_24dp"
+                    app:iconSize="24dp"
+                    android:backgroundTint="#00000000" />
+
+            </com.google.android.material.button.MaterialButtonToggleGroup>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/comments_count_button_item_post_video_type_autoplay"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:gravity="center_vertical"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
                 android:textSize="?attr/font_12"
                 android:textStyle="bold"
                 android:fontFamily="?attr/font_family"
-                android:drawableStart="@drawable/ic_comment_grey_24dp"
-                android:drawablePadding="12dp"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_comment_grey_24dp"
+                app:iconTint="@null"
+                app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/minus_button_item_post_video_type_autoplay" />
+                app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_video_type_autoplay"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
-            <ImageView
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/save_button_item_post_video_type_autoplay"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
+                app:strokeWidth="0dp"
+                app:iconSize="24dp"
                 app:layout_constraintHorizontal_bias="1"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/comments_count_item_post_video_type_autoplay"
-                app:layout_constraintEnd_toStartOf="@id/share_button_item_post_video_type_autoplay" />
+                app:layout_constraintStart_toEndOf="@id/comments_count_button_item_post_video_type_autoplay"
+                app:layout_constraintEnd_toStartOf="@id/share_button_item_post_video_type_autoplay"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
-            <ImageView
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/share_button_item_post_video_type_autoplay"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:src="@drawable/ic_share_grey_24dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_share_grey_24dp"
+                app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" />
+                app:layout_constraintEnd_toEndOf="parent"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_post_with_preview.xml b/app/src/main/res/layout/item_post_with_preview.xml
index e0162b1c..f04b4307 100644
--- a/app/src/main/res/layout/item_post_with_preview.xml
+++ b/app/src/main/res/layout/item_post_with_preview.xml
@@ -257,87 +257,92 @@
         <androidx.constraintlayout.widget.ConstraintLayout
             android:id="@+id/bottom_constraint_layout_item_post_with_preview"
             android:layout_width="match_parent"
-            android:layout_height="wrap_content">
-
-            <ImageView
-                android:id="@+id/plus_button_item_post_with_preview"
-                android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:src="@drawable/ic_arrow_upward_grey_24dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toStartOf="parent" />
-
-            <TextView
-                android:id="@+id/score_text_view_item_post_with_preview"
-                android:layout_width="64dp"
-                android:layout_height="wrap_content"
-                android:gravity="center"
-                android:textSize="?attr/font_12"
-                android:textStyle="bold"
-                android:fontFamily="?attr/font_family"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/plus_button_item_post_with_preview" />
+            android:layout_height="wrap_content"
+            android:padding="8dp">
 
-            <ImageView
-                android:id="@+id/minus_button_item_post_with_preview"
-                android:layout_width="wrap_content"
+            <com.google.android.material.button.MaterialButtonToggleGroup
+                android:id="@+id/vote_button_toggle_item_post_with_preview"
+                android:layout_width="0dp"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:src="@drawable/ic_arrow_downward_grey_24dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
+                app:singleSelection="true"
+                app:layout_constraintStart_toStartOf="parent"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_with_preview" />
-
-            <TextView
-                android:id="@+id/comments_count_item_post_with_preview"
+                app:layout_constraintBottom_toBottomOf="parent">
+
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:id="@+id/upvote_button_item_post_with_preview"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
+                    android:minWidth="0dp"
+                    android:textSize="?attr/font_12"
+                    android:textStyle="bold"
+                    android:fontFamily="?attr/font_family"
+                    app:strokeWidth="0dp"
+                    app:icon="@drawable/ic_upvote_24dp"
+                    app:iconSize="24dp"
+                    android:backgroundTint="#00000000" />
+
+                <com.google.android.material.button.MaterialButton
+                    style="?attr/materialButtonOutlinedStyle"
+                    android:id="@+id/downvote_button_item_post_with_preview"
+                    android:layout_width="wrap_content"
+                    android:layout_height="match_parent"
+                    android:paddingStart="8dp"
+                    android:paddingEnd="8dp"
+                    android:minWidth="0dp"
+                    app:strokeWidth="0dp"
+                    app:icon="@drawable/ic_downvote_24dp"
+                    app:iconSize="24dp"
+                    android:backgroundTint="#00000000" />
+
+            </com.google.android.material.button.MaterialButtonToggleGroup>
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/comments_count_button_item_post_with_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:gravity="center_vertical"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
                 android:textSize="?attr/font_12"
                 android:textStyle="bold"
                 android:fontFamily="?attr/font_family"
-                android:drawableStart="@drawable/ic_comment_grey_24dp"
-                android:drawablePadding="12dp"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_comment_grey_24dp"
+                app:iconTint="@null"
+                app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/minus_button_item_post_with_preview" />
+                app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_with_preview"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
-            <ImageView
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/save_button_item_post_with_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
+                app:strokeWidth="0dp"
+                app:iconSize="24dp"
                 app:layout_constraintHorizontal_bias="1"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/comments_count_item_post_with_preview"
-                app:layout_constraintEnd_toStartOf="@id/share_button_item_post_with_preview" />
+                app:layout_constraintStart_toEndOf="@id/comments_count_button_item_post_with_preview"
+                app:layout_constraintEnd_toStartOf="@id/share_button_item_post_with_preview"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
-            <ImageView
+            <com.google.android.material.button.MaterialButton
                 android:id="@+id/share_button_item_post_with_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
-                android:padding="12dp"
-                android:src="@drawable/ic_share_grey_24dp"
-                android:background="?actionBarItemBackground"
-                android:clickable="true"
-                android:focusable="true"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_share_grey_24dp"
+                app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintEnd_toEndOf="parent" />
+                app:layout_constraintEnd_toEndOf="parent"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>