From 7c6ee5beba83522ad49b54a3fdfdf6d03de107ba Mon Sep 17 00:00:00 2001
From: Docile-Alligator <25734209+Docile-Alligator@users.noreply.github.com>
Date: Mon, 23 Oct 2023 00:29:08 -0400
Subject: Center the score of a post. Switch the number of comment and the
 share button back.

---
 .../res/layout/item_post_card_2_gallery_type.xml   |  78 +++++++-------
 app/src/main/res/layout/item_post_card_2_text.xml  |  78 +++++++-------
 .../res/layout/item_post_card_2_video_autoplay.xml |  78 +++++++-------
 ...ost_card_2_video_autoplay_legacy_controller.xml |  78 +++++++-------
 .../res/layout/item_post_card_2_with_preview.xml   |  80 ++++++++-------
 .../res/layout/item_post_card_3_gallery_type.xml   | 109 ++++++++++----------
 app/src/main/res/layout/item_post_card_3_text.xml  | 109 ++++++++++----------
 .../item_post_card_3_video_type_autoplay.xml       | 109 ++++++++++----------
 ...ard_3_video_type_autoplay_legacy_controller.xml | 109 ++++++++++----------
 .../res/layout/item_post_card_3_with_preview.xml   | 112 +++++++++++----------
 app/src/main/res/layout/item_post_compact.xml      |  78 +++++++-------
 .../layout/item_post_compact_right_thumbnail.xml   |  78 +++++++-------
 .../main/res/layout/item_post_detail_gallery.xml   |  82 ++++++++-------
 .../item_post_detail_image_and_gif_autoplay.xml    |  78 +++++++-------
 app/src/main/res/layout/item_post_detail_link.xml  |  78 +++++++-------
 .../res/layout/item_post_detail_no_preview.xml     |  82 ++++++++-------
 app/src/main/res/layout/item_post_detail_text.xml  |  78 +++++++-------
 .../item_post_detail_video_and_gif_preview.xml     |  78 +++++++-------
 .../res/layout/item_post_detail_video_autoplay.xml |  82 ++++++++-------
 ...ost_detail_video_autoplay_legacy_controller.xml |  82 ++++++++-------
 app/src/main/res/layout/item_post_gallery_type.xml |  80 ++++++++-------
 app/src/main/res/layout/item_post_text.xml         |  78 +++++++-------
 .../res/layout/item_post_video_type_autoplay.xml   |  80 ++++++++-------
 ..._post_video_type_autoplay_legacy_controller.xml |  80 ++++++++-------
 app/src/main/res/layout/item_post_with_preview.xml |  80 ++++++++-------
 25 files changed, 1118 insertions(+), 1016 deletions(-)

(limited to 'app/src/main/res')

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 e039bfff..49c293b1 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
@@ -220,45 +220,49 @@
         android:paddingStart="8dp"
         android:paddingEnd="8dp">
 
-        <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"
-            app:singleSelection="true"
-            app:layout_constraintStart_toStartOf="parent"
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            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:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_upvote_24dp"
+            app:iconSize="24dp"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
-            <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" />
+        <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" />
 
-        </com.google.android.material.button.MaterialButtonToggleGroup>
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            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"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_downvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_card_2_gallery_type" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/comments_count_button_item_post_card_2_gallery_type"
@@ -277,7 +281,7 @@
             app:iconPadding="12dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_card_2_gallery_type"
+            app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_card_2_gallery_type"
             style="?attr/materialIconButtonOutlinedStyle" />
 
         <com.google.android.material.button.MaterialButton
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 28847320..45e24a76 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
@@ -180,45 +180,49 @@
         android:paddingStart="8dp"
         android:paddingEnd="8dp">
 
-        <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"
-            app:singleSelection="true"
-            app:layout_constraintStart_toStartOf="parent"
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            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:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_upvote_24dp"
+            app:iconSize="24dp"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
-
-            <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" />
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
-            <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/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/upvote_button_item_post_card_2_text" />
 
-        </com.google.android.material.button.MaterialButtonToggleGroup>
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            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"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_downvote_24dp"
+            app:iconSize="24dp"
+            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
             android:id="@+id/comments_count_button_item_post_card_2_text"
@@ -237,7 +241,7 @@
             app:iconPadding="12dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_card_2_text"
+            app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_card_2_text"
             style="?attr/materialIconButtonOutlinedStyle" />
 
         <com.google.android.material.button.MaterialButton
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 0bf4a764..72d758e0 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
@@ -221,45 +221,49 @@
         android:paddingStart="8dp"
         android:paddingEnd="8dp">
 
-        <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"
-            app:singleSelection="true"
-            app:layout_constraintStart_toStartOf="parent"
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            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:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_upvote_24dp"
+            app:iconSize="24dp"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
-            <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" />
+        <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/upvote_button_item_post_card_2_video_autoplay" />
 
-        </com.google.android.material.button.MaterialButtonToggleGroup>
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            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"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_downvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_card_2_video_autoplay" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/comments_count_button_item_post_card_2_video_autoplay"
@@ -278,7 +282,7 @@
             app:iconPadding="12dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_card_2_video_autoplay"
+            app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_card_2_video_autoplay"
             style="?attr/materialIconButtonOutlinedStyle" />
 
         <com.google.android.material.button.MaterialButton
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 34798142..95124881 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
@@ -221,45 +221,49 @@
         android:paddingStart="8dp"
         android:paddingEnd="8dp">
 
-        <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"
-            app:singleSelection="true"
-            app:layout_constraintStart_toStartOf="parent"
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            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:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_upvote_24dp"
+            app:iconSize="24dp"
             app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toStartOf="parent" />
 
-            <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" />
+        <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/upvote_button_item_post_card_2_video_autoplay" />
 
-        </com.google.android.material.button.MaterialButtonToggleGroup>
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            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"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_downvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_card_2_video_autoplay" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/comments_count_button_item_post_card_2_video_autoplay"
@@ -278,7 +282,7 @@
             app:iconPadding="12dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_card_2_video_autoplay"
+            app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_card_2_video_autoplay"
             style="?attr/materialIconButtonOutlinedStyle" />
 
         <com.google.android.material.button.MaterialButton
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 7514fffc..63f5fde8 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
@@ -232,45 +232,49 @@
         android:paddingStart="8dp"
         android:paddingEnd="8dp">
 
-        <com.google.android.material.button.MaterialButtonToggleGroup
-            android:id="@+id/vote_button_toggle_item_post_card_2_with_preview"
-            android:layout_width="0dp"
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            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:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_upvote_24dp"
+            app:iconSize="24dp"
+            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"
-            app:singleSelection="true"
-            app:layout_constraintStart_toStartOf="parent"
+            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">
-
-            <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>
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/upvote_button_item_post_card_2_with_preview" />
+
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            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"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_downvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintTop_toTopOf="parent"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_card_2_with_preview" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/comments_count_button_item_post_card_2_with_preview"
@@ -289,7 +293,7 @@
             app:iconPadding="12dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_card_2_with_preview"
+            app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_card_2_with_preview"
             style="?attr/materialIconButtonOutlinedStyle" />
 
         <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/item_post_card_3_gallery_type.xml b/app/src/main/res/layout/item_post_card_3_gallery_type.xml
index 40e23972..d8079ca3 100644
--- a/app/src/main/res/layout/item_post_card_3_gallery_type.xml
+++ b/app/src/main/res/layout/item_post_card_3_gallery_type.xml
@@ -143,68 +143,49 @@
             android:layout_height="wrap_content"
             android:padding="8dp">
 
-            <com.google.android.material.button.MaterialButtonToggleGroup
-                android:id="@+id/vote_button_toggle_item_post_card_3_gallery_type"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                app:singleSelection="true"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent">
-
-                <com.google.android.material.button.MaterialButton
-                    style="?attr/materialButtonOutlinedStyle"
-                    android:id="@+id/upvote_button_item_post_card_3_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_3_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/save_button_item_post_card_3_gallery_type"
+                style="?attr/materialIconButtonStyle"
+                android:id="@+id/upvote_button_item_post_card_3_gallery_type"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
+                android:backgroundTint="#00000000"
                 app:strokeWidth="0dp"
+                app:icon="@drawable/ic_upvote_24dp"
                 app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_card_3_gallery_type"
-                style="?attr/materialIconButtonOutlinedStyle" />
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <TextView
+                android:id="@+id/score_text_view_item_post_card_3_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_3_gallery_type" />
 
             <com.google.android.material.button.MaterialButton
-                android:id="@+id/share_button_item_post_card_3_gallery_type"
+                style="?attr/materialIconButtonStyle"
+                android:id="@+id/downvote_button_item_post_card_3_gallery_type"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
+                android:backgroundTint="#00000000"
                 app:strokeWidth="0dp"
-                app:icon="@drawable/ic_share_grey_24dp"
+                app:icon="@drawable/ic_downvote_24dp"
                 app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/save_button_item_post_card_3_gallery_type"
-                style="?attr/materialIconButtonOutlinedStyle" />
+                app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_card_3_gallery_type" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/comments_count_button_item_post_card_3_gallery_type"
@@ -217,15 +198,39 @@
                 android:textStyle="bold"
                 android:fontFamily="?attr/font_family"
                 app:strokeWidth="0dp"
+                app:icon="@drawable/ic_comment_grey_24dp"
                 app:iconTint="@null"
                 app:iconSize="24dp"
                 app:iconPadding="12dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/share_button_item_post_card_3_gallery_type"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_card_3_gallery_type"
+                style="?attr/materialIconButtonOutlinedStyle" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/save_button_item_post_card_3_gallery_type"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:strokeWidth="0dp"
+                app:iconSize="24dp"
                 app:layout_constraintHorizontal_bias="1"
-                style="?attr/materialButtonOutlinedStyle" />
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@id/comments_count_button_item_post_card_3_gallery_type"
+                app:layout_constraintEnd_toStartOf="@id/share_button_item_post_card_3_gallery_type"
+                style="?attr/materialIconButtonOutlinedStyle" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/share_button_item_post_card_3_gallery_type"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                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"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_post_card_3_text.xml b/app/src/main/res/layout/item_post_card_3_text.xml
index dbf9ac7e..88dc22d5 100644
--- a/app/src/main/res/layout/item_post_card_3_text.xml
+++ b/app/src/main/res/layout/item_post_card_3_text.xml
@@ -121,68 +121,49 @@
             android:layout_height="wrap_content"
             android:padding="8dp">
 
-            <com.google.android.material.button.MaterialButtonToggleGroup
-                android:id="@+id/vote_button_toggle_item_post_card_3_text_type"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                app:singleSelection="true"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent">
-
-                <com.google.android.material.button.MaterialButton
-                    style="?attr/materialButtonOutlinedStyle"
-                    android:id="@+id/upvote_button_item_post_card_3_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" />
-
-                <com.google.android.material.button.MaterialButton
-                    style="?attr/materialButtonOutlinedStyle"
-                    android:id="@+id/downvote_button_item_post_card_3_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" />
-
-            </com.google.android.material.button.MaterialButtonToggleGroup>
-
             <com.google.android.material.button.MaterialButton
-                android:id="@+id/save_button_item_post_card_3_text_type"
+                style="?attr/materialIconButtonStyle"
+                android:id="@+id/upvote_button_item_post_card_3_text_type"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
+                android:backgroundTint="#00000000"
                 app:strokeWidth="0dp"
+                app:icon="@drawable/ic_upvote_24dp"
                 app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_card_3_text_type"
-                style="?attr/materialIconButtonOutlinedStyle" />
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <TextView
+                android:id="@+id/score_text_view_item_post_card_3_text_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_3_text_type" />
 
             <com.google.android.material.button.MaterialButton
-                android:id="@+id/share_button_item_post_card_3_text_type"
+                style="?attr/materialIconButtonStyle"
+                android:id="@+id/downvote_button_item_post_card_3_text_type"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
+                android:backgroundTint="#00000000"
                 app:strokeWidth="0dp"
-                app:icon="@drawable/ic_share_grey_24dp"
+                app:icon="@drawable/ic_downvote_24dp"
                 app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/save_button_item_post_card_3_text_type"
-                style="?attr/materialIconButtonOutlinedStyle" />
+                app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_card_3_text_type" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/comments_count_button_item_post_card_3_text_type"
@@ -195,15 +176,39 @@
                 android:textStyle="bold"
                 android:fontFamily="?attr/font_family"
                 app:strokeWidth="0dp"
+                app:icon="@drawable/ic_comment_grey_24dp"
                 app:iconTint="@null"
                 app:iconSize="24dp"
                 app:iconPadding="12dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/share_button_item_post_card_3_text_type"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_card_3_text_type"
+                style="?attr/materialIconButtonOutlinedStyle" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/save_button_item_post_card_3_text_type"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:strokeWidth="0dp"
+                app:iconSize="24dp"
                 app:layout_constraintHorizontal_bias="1"
-                style="?attr/materialButtonOutlinedStyle" />
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@id/comments_count_button_item_post_card_3_text_type"
+                app:layout_constraintEnd_toStartOf="@id/share_button_item_post_card_3_text_type"
+                style="?attr/materialIconButtonOutlinedStyle" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/share_button_item_post_card_3_text_type"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                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"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_post_card_3_video_type_autoplay.xml b/app/src/main/res/layout/item_post_card_3_video_type_autoplay.xml
index 52e55726..1fc8a3c4 100644
--- a/app/src/main/res/layout/item_post_card_3_video_type_autoplay.xml
+++ b/app/src/main/res/layout/item_post_card_3_video_type_autoplay.xml
@@ -143,68 +143,49 @@
             android:layout_height="wrap_content"
             android:padding="8dp">
 
-            <com.google.android.material.button.MaterialButtonToggleGroup
-                android:id="@+id/vote_button_toggle_item_post_card_3_video_type_autoplay"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                app:singleSelection="true"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent">
-
-                <com.google.android.material.button.MaterialButton
-                    style="?attr/materialButtonOutlinedStyle"
-                    android:id="@+id/upvote_button_item_post_card_3_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_card_3_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/save_button_item_post_card_3_video_type_autoplay"
+                style="?attr/materialIconButtonStyle"
+                android:id="@+id/upvote_button_item_post_card_3_video_type_autoplay"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
+                android:backgroundTint="#00000000"
                 app:strokeWidth="0dp"
+                app:icon="@drawable/ic_upvote_24dp"
                 app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_card_3_video_type_autoplay"
-                style="?attr/materialIconButtonOutlinedStyle" />
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <TextView
+                android:id="@+id/score_text_view_item_post_card_3_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/upvote_button_item_post_card_3_video_type_autoplay" />
 
             <com.google.android.material.button.MaterialButton
-                android:id="@+id/share_button_item_post_card_3_video_type_autoplay"
+                style="?attr/materialIconButtonStyle"
+                android:id="@+id/downvote_button_item_post_card_3_video_type_autoplay"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
+                android:backgroundTint="#00000000"
                 app:strokeWidth="0dp"
-                app:icon="@drawable/ic_share_grey_24dp"
+                app:icon="@drawable/ic_downvote_24dp"
                 app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/save_button_item_post_card_3_video_type_autoplay"
-                style="?attr/materialIconButtonOutlinedStyle" />
+                app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_card_3_video_type_autoplay" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/comments_count_button_item_post_card_3_video_type_autoplay"
@@ -217,15 +198,39 @@
                 android:textStyle="bold"
                 android:fontFamily="?attr/font_family"
                 app:strokeWidth="0dp"
+                app:icon="@drawable/ic_comment_grey_24dp"
                 app:iconTint="@null"
                 app:iconSize="24dp"
                 app:iconPadding="12dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/share_button_item_post_card_3_video_type_autoplay"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_card_3_video_type_autoplay"
+                style="?attr/materialIconButtonOutlinedStyle" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/save_button_item_post_card_3_video_type_autoplay"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:strokeWidth="0dp"
+                app:iconSize="24dp"
                 app:layout_constraintHorizontal_bias="1"
-                style="?attr/materialButtonOutlinedStyle" />
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@id/comments_count_button_item_post_card_3_video_type_autoplay"
+                app:layout_constraintEnd_toStartOf="@id/share_button_item_post_card_3_video_type_autoplay"
+                style="?attr/materialIconButtonOutlinedStyle" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/share_button_item_post_card_3_video_type_autoplay"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                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"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_post_card_3_video_type_autoplay_legacy_controller.xml b/app/src/main/res/layout/item_post_card_3_video_type_autoplay_legacy_controller.xml
index 9964bb2b..b100b032 100644
--- a/app/src/main/res/layout/item_post_card_3_video_type_autoplay_legacy_controller.xml
+++ b/app/src/main/res/layout/item_post_card_3_video_type_autoplay_legacy_controller.xml
@@ -143,68 +143,49 @@
             android:layout_height="wrap_content"
             android:padding="8dp">
 
-            <com.google.android.material.button.MaterialButtonToggleGroup
-                android:id="@+id/vote_button_toggle_item_post_card_3_video_type_autoplay"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                app:singleSelection="true"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent">
-
-                <com.google.android.material.button.MaterialButton
-                    style="?attr/materialButtonOutlinedStyle"
-                    android:id="@+id/upvote_button_item_post_card_3_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_card_3_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/save_button_item_post_card_3_video_type_autoplay"
+                style="?attr/materialIconButtonStyle"
+                android:id="@+id/upvote_button_item_post_card_3_video_type_autoplay"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
+                android:backgroundTint="#00000000"
                 app:strokeWidth="0dp"
+                app:icon="@drawable/ic_upvote_24dp"
                 app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_card_3_video_type_autoplay"
-                style="?attr/materialIconButtonOutlinedStyle" />
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <TextView
+                android:id="@+id/score_text_view_item_post_card_3_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/upvote_button_item_post_card_3_video_type_autoplay" />
 
             <com.google.android.material.button.MaterialButton
-                android:id="@+id/share_button_item_post_card_3_video_type_autoplay"
+                style="?attr/materialIconButtonStyle"
+                android:id="@+id/downvote_button_item_post_card_3_video_type_autoplay"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
+                android:backgroundTint="#00000000"
                 app:strokeWidth="0dp"
-                app:icon="@drawable/ic_share_grey_24dp"
+                app:icon="@drawable/ic_downvote_24dp"
                 app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/save_button_item_post_card_3_video_type_autoplay"
-                style="?attr/materialIconButtonOutlinedStyle" />
+                app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_card_3_video_type_autoplay" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/comments_count_button_item_post_card_3_video_type_autoplay"
@@ -217,15 +198,39 @@
                 android:textStyle="bold"
                 android:fontFamily="?attr/font_family"
                 app:strokeWidth="0dp"
+                app:icon="@drawable/ic_comment_grey_24dp"
                 app:iconTint="@null"
                 app:iconSize="24dp"
                 app:iconPadding="12dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/share_button_item_post_card_3_video_type_autoplay"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_card_3_video_type_autoplay"
+                style="?attr/materialIconButtonOutlinedStyle" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/save_button_item_post_card_3_video_type_autoplay"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:strokeWidth="0dp"
+                app:iconSize="24dp"
                 app:layout_constraintHorizontal_bias="1"
-                style="?attr/materialButtonOutlinedStyle" />
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@id/comments_count_button_item_post_card_3_video_type_autoplay"
+                app:layout_constraintEnd_toStartOf="@id/share_button_item_post_card_3_video_type_autoplay"
+                style="?attr/materialIconButtonOutlinedStyle" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/share_button_item_post_card_3_video_type_autoplay"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                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"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_post_card_3_with_preview.xml b/app/src/main/res/layout/item_post_card_3_with_preview.xml
index 7efab154..dee7356e 100644
--- a/app/src/main/res/layout/item_post_card_3_with_preview.xml
+++ b/app/src/main/res/layout/item_post_card_3_with_preview.xml
@@ -240,9 +240,6 @@
                 android:layout_height="24dp"
                 android:src="@drawable/ic_archive_outline"
                 android:visibility="gone" />
-
-            <ImageView
-                android:id="@+id/locked_image_view_item_post_card_3_with_preview"
                 android:layout_width="24dp"
                 android:layout_height="24dp"
                 android:src="@drawable/ic_outline_lock_24dp"
@@ -263,68 +260,49 @@
             android:layout_height="wrap_content"
             android:padding="8dp">
 
-            <com.google.android.material.button.MaterialButtonToggleGroup
-                android:id="@+id/vote_button_toggle_item_post_card_3_with_preview"
-                android:layout_width="0dp"
-                android:layout_height="wrap_content"
-                app:singleSelection="true"
-                app:layout_constraintStart_toStartOf="parent"
-                app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent">
-
-                <com.google.android.material.button.MaterialButton
-                    style="?attr/materialButtonOutlinedStyle"
-                    android:id="@+id/upvote_button_item_post_card_3_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_3_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/save_button_item_post_card_3_with_preview"
+                style="?attr/materialIconButtonStyle"
+                android:id="@+id/upvote_button_item_post_card_3_with_preview"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
+                android:backgroundTint="#00000000"
                 app:strokeWidth="0dp"
+                app:icon="@drawable/ic_upvote_24dp"
                 app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_card_3_with_preview"
-                style="?attr/materialIconButtonOutlinedStyle" />
+                app:layout_constraintStart_toStartOf="parent" />
+
+            <TextView
+                android:id="@+id/score_text_view_item_post_card_3_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/upvote_button_item_post_card_3_with_preview" />
 
             <com.google.android.material.button.MaterialButton
-                android:id="@+id/share_button_item_post_card_3_with_preview"
+                style="?attr/materialIconButtonStyle"
+                android:id="@+id/downvote_button_item_post_card_3_with_preview"
                 android:layout_width="wrap_content"
-                android:layout_height="wrap_content"
+                android:layout_height="match_parent"
+                android:paddingStart="8dp"
+                android:paddingEnd="8dp"
+                android:minWidth="0dp"
+                android:backgroundTint="#00000000"
                 app:strokeWidth="0dp"
-                app:icon="@drawable/ic_share_grey_24dp"
+                app:icon="@drawable/ic_downvote_24dp"
                 app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/save_button_item_post_card_3_with_preview"
-                style="?attr/materialIconButtonOutlinedStyle" />
+                app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_card_3_with_preview" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/comments_count_button_item_post_card_3_with_preview"
@@ -337,15 +315,39 @@
                 android:textStyle="bold"
                 android:fontFamily="?attr/font_family"
                 app:strokeWidth="0dp"
+                app:icon="@drawable/ic_comment_grey_24dp"
                 app:iconTint="@null"
                 app:iconSize="24dp"
                 app:iconPadding="12dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/share_button_item_post_card_3_with_preview"
-                app:layout_constraintEnd_toEndOf="parent"
+                app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_card_3_with_preview"
+                style="?attr/materialIconButtonOutlinedStyle" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/save_button_item_post_card_3_with_preview"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                app:strokeWidth="0dp"
+                app:iconSize="24dp"
                 app:layout_constraintHorizontal_bias="1"
-                style="?attr/materialButtonOutlinedStyle" />
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@id/comments_count_button_item_post_card_3_with_preview"
+                app:layout_constraintEnd_toStartOf="@id/share_button_item_post_card_3_with_preview"
+                style="?attr/materialIconButtonOutlinedStyle" />
+
+            <com.google.android.material.button.MaterialButton
+                android:id="@+id/share_button_item_post_card_3_with_preview"
+                android:layout_width="wrap_content"
+                android:layout_height="wrap_content"
+                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"
+                style="?attr/materialIconButtonOutlinedStyle" />
 
         </androidx.constraintlayout.widget.ConstraintLayout>
 
diff --git a/app/src/main/res/layout/item_post_compact.xml b/app/src/main/res/layout/item_post_compact.xml
index 8bc6ee26..442c589a 100644
--- a/app/src/main/res/layout/item_post_compact.xml
+++ b/app/src/main/res/layout/item_post_compact.xml
@@ -286,45 +286,49 @@
         android:paddingStart="8dp"
         android:paddingEnd="8dp">
 
-        <com.google.android.material.button.MaterialButtonToggleGroup
-            android:id="@+id/vote_button_toggle_item_post_compact"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:singleSelection="true"
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            android:id="@+id/upvote_button_item_post_compact"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_upvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
+            app:layout_constraintTop_toTopOf="parent" />
 
-            <com.google.android.material.button.MaterialButton
-                style="?attr/materialButtonOutlinedStyle"
-                android:id="@+id/upvote_button_item_post_compact"
-                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_compact"
-                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/score_text_view_item_post_compact"
+            android:layout_width="64dp"
+            android:layout_height="wrap_content"
+            android:fontFamily="?attr/font_family"
+            android:gravity="center"
+            android:textSize="?attr/font_12"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/upvote_button_item_post_compact"
+            app:layout_constraintTop_toTopOf="parent" />
 
-        </com.google.android.material.button.MaterialButtonToggleGroup>
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            android:id="@+id/downvote_button_item_post_compact"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_downvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_compact"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/save_button_item_post_compact"
@@ -334,7 +338,7 @@
             app:iconSize="24dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_compact"
+            app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_compact"
             style="?attr/materialIconButtonOutlinedStyle" />
 
         <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/item_post_compact_right_thumbnail.xml b/app/src/main/res/layout/item_post_compact_right_thumbnail.xml
index b2db13b7..b973ffe3 100644
--- a/app/src/main/res/layout/item_post_compact_right_thumbnail.xml
+++ b/app/src/main/res/layout/item_post_compact_right_thumbnail.xml
@@ -283,45 +283,49 @@
         android:paddingStart="8dp"
         android:paddingEnd="8dp">
 
-        <com.google.android.material.button.MaterialButtonToggleGroup
-            android:id="@+id/vote_button_toggle_item_post_compact_right_thumbnail"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:singleSelection="true"
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            android:id="@+id/upvote_button_item_post_compact_right_thumbnail"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_upvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
+            app:layout_constraintTop_toTopOf="parent" />
 
-            <com.google.android.material.button.MaterialButton
-                style="?attr/materialButtonOutlinedStyle"
-                android:id="@+id/upvote_button_item_post_compact_right_thumbnail"
-                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_compact_right_thumbnail"
-                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/score_text_view_item_post_compact_right_thumbnail"
+            android:layout_width="64dp"
+            android:layout_height="wrap_content"
+            android:fontFamily="?attr/font_family"
+            android:gravity="center"
+            android:textSize="?attr/font_12"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/upvote_button_item_post_compact_right_thumbnail"
+            app:layout_constraintTop_toTopOf="parent" />
 
-        </com.google.android.material.button.MaterialButtonToggleGroup>
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            android:id="@+id/downvote_button_item_post_compact_right_thumbnail"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_downvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_compact_right_thumbnail"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/save_button_item_post_compact_right_thumbnail"
@@ -331,7 +335,7 @@
             app:iconSize="24dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_compact_right_thumbnail"
+            app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_compact_right_thumbnail"
             style="?attr/materialIconButtonOutlinedStyle" />
 
         <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/item_post_detail_gallery.xml b/app/src/main/res/layout/item_post_detail_gallery.xml
index d9016438..0148dd87 100644
--- a/app/src/main/res/layout/item_post_detail_gallery.xml
+++ b/app/src/main/res/layout/item_post_detail_gallery.xml
@@ -253,45 +253,49 @@
         android:paddingStart="8dp"
         android:paddingEnd="8dp">
 
-        <com.google.android.material.button.MaterialButtonToggleGroup
-            android:id="@+id/vote_button_toggle_item_post_detail_gallery"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:singleSelection="true"
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            android:id="@+id/upvote_button_item_post_detail_gallery"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_upvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
-
-            <com.google.android.material.button.MaterialButton
-                style="?attr/materialButtonOutlinedStyle"
-                android:id="@+id/upvote_button_item_post_detail_gallery"
-                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_detail_gallery"
-                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>
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/score_text_view_item_post_detail_gallery"
+            android:layout_width="64dp"
+            android:layout_height="wrap_content"
+            android:fontFamily="?attr/font_family"
+            android:gravity="center"
+            android:textSize="?attr/font_12"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/upvote_button_item_post_detail_gallery"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            android:id="@+id/downvote_button_item_post_detail_gallery"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_downvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_detail_gallery"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/comments_count_button_item_post_detail_gallery"
@@ -310,7 +314,7 @@
             app:iconPadding="12dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_detail_gallery"
+            app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_detail_gallery"
             style="?attr/materialIconButtonOutlinedStyle" />
 
         <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml b/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml
index b71ae921..e3294db6 100644
--- a/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml
+++ b/app/src/main/res/layout/item_post_detail_image_and_gif_autoplay.xml
@@ -258,45 +258,49 @@
         android:paddingStart="8dp"
         android:paddingEnd="8dp">
 
-        <com.google.android.material.button.MaterialButtonToggleGroup
-            android:id="@+id/vote_button_toggle_item_post_detail_image_and_gif_autoplay"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:singleSelection="true"
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            android:id="@+id/upvote_button_item_post_detail_image_and_gif_autoplay"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_upvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
+            app:layout_constraintTop_toTopOf="parent" />
 
-            <com.google.android.material.button.MaterialButton
-                style="?attr/materialButtonOutlinedStyle"
-                android:id="@+id/upvote_button_item_post_detail_image_and_gif_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_detail_image_and_gif_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" />
+        <TextView
+            android:id="@+id/score_text_view_item_post_detail_image_and_gif_autoplay"
+            android:layout_width="64dp"
+            android:layout_height="wrap_content"
+            android:fontFamily="?attr/font_family"
+            android:gravity="center"
+            android:textSize="?attr/font_12"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/upvote_button_item_post_detail_image_and_gif_autoplay"
+            app:layout_constraintTop_toTopOf="parent" />
 
-        </com.google.android.material.button.MaterialButtonToggleGroup>
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            android:id="@+id/downvote_button_item_post_detail_image_and_gif_autoplay"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_downvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_detail_image_and_gif_autoplay"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/comments_count_button_item_post_detail_image_and_gif_autoplay"
@@ -315,7 +319,7 @@
             app:iconPadding="12dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_detail_image_and_gif_autoplay"
+            app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_detail_image_and_gif_autoplay"
             style="?attr/materialIconButtonOutlinedStyle" />
 
         <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/item_post_detail_link.xml b/app/src/main/res/layout/item_post_detail_link.xml
index 4074f4b4..5b0dcb03 100644
--- a/app/src/main/res/layout/item_post_detail_link.xml
+++ b/app/src/main/res/layout/item_post_detail_link.xml
@@ -268,45 +268,49 @@
         android:paddingStart="8dp"
         android:paddingEnd="8dp">
 
-        <com.google.android.material.button.MaterialButtonToggleGroup
-            android:id="@+id/vote_button_toggle_item_post_detail_link"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:singleSelection="true"
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            android:id="@+id/upvote_button_item_post_detail_link"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_upvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
+            app:layout_constraintTop_toTopOf="parent" />
 
-            <com.google.android.material.button.MaterialButton
-                style="?attr/materialButtonOutlinedStyle"
-                android:id="@+id/upvote_button_item_post_detail_link"
-                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_detail_link"
-                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/score_text_view_item_post_detail_link"
+            android:layout_width="64dp"
+            android:layout_height="wrap_content"
+            android:fontFamily="?attr/font_family"
+            android:gravity="center"
+            android:textSize="?attr/font_12"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/upvote_button_item_post_detail_link"
+            app:layout_constraintTop_toTopOf="parent" />
 
-        </com.google.android.material.button.MaterialButtonToggleGroup>
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            android:id="@+id/downvote_button_item_post_detail_link"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_downvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_detail_link"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/comments_count_button_item_post_detail_link"
@@ -325,7 +329,7 @@
             app:iconPadding="12dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_detail_link"
+            app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_detail_link"
             style="?attr/materialIconButtonOutlinedStyle" />
 
         <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/item_post_detail_no_preview.xml b/app/src/main/res/layout/item_post_detail_no_preview.xml
index b460f0d7..f1d47fde 100644
--- a/app/src/main/res/layout/item_post_detail_no_preview.xml
+++ b/app/src/main/res/layout/item_post_detail_no_preview.xml
@@ -235,45 +235,49 @@
         android:paddingStart="8dp"
         android:paddingEnd="8dp">
 
-        <com.google.android.material.button.MaterialButtonToggleGroup
-            android:id="@+id/vote_button_toggle_item_post_detail_no_preview"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:singleSelection="true"
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            android:id="@+id/upvote_button_item_post_detail_no_preview"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_upvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
-
-            <com.google.android.material.button.MaterialButton
-                style="?attr/materialButtonOutlinedStyle"
-                android:id="@+id/upvote_button_item_post_detail_no_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_detail_no_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>
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/score_text_view_item_post_detail_no_preview"
+            android:layout_width="64dp"
+            android:layout_height="wrap_content"
+            android:fontFamily="?attr/font_family"
+            android:gravity="center"
+            android:textSize="?attr/font_12"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/upvote_button_item_post_detail_no_preview"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            android:id="@+id/downvote_button_item_post_detail_no_preview"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_downvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_detail_no_preview"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/comments_count_button_item_post_detail_no_preview"
@@ -292,7 +296,7 @@
             app:iconPadding="12dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_detail_no_preview"
+            app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_detail_no_preview"
             style="?attr/materialIconButtonOutlinedStyle" />
 
         <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/item_post_detail_text.xml b/app/src/main/res/layout/item_post_detail_text.xml
index 625a598d..8ef8cf2e 100644
--- a/app/src/main/res/layout/item_post_detail_text.xml
+++ b/app/src/main/res/layout/item_post_detail_text.xml
@@ -219,45 +219,49 @@
         android:paddingStart="8dp"
         android:paddingEnd="8dp">
 
-        <com.google.android.material.button.MaterialButtonToggleGroup
-            android:id="@+id/vote_button_toggle_item_post_detail_text"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:singleSelection="true"
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            android:id="@+id/upvote_button_item_post_detail_text"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_upvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
-
-            <com.google.android.material.button.MaterialButton
-                style="?attr/materialButtonOutlinedStyle"
-                android:id="@+id/upvote_button_item_post_detail_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" />
+            app:layout_constraintTop_toTopOf="parent" />
 
-            <com.google.android.material.button.MaterialButton
-                style="?attr/materialButtonOutlinedStyle"
-                android:id="@+id/downvote_button_item_post_detail_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/score_text_view_item_post_detail_text"
+            android:layout_width="64dp"
+            android:layout_height="wrap_content"
+            android:fontFamily="?attr/font_family"
+            android:gravity="center"
+            android:textSize="?attr/font_12"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/upvote_button_item_post_detail_text"
+            app:layout_constraintTop_toTopOf="parent" />
 
-        </com.google.android.material.button.MaterialButtonToggleGroup>
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            android:id="@+id/downvote_button_item_post_detail_text"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_downvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_detail_text"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/comments_count_button_item_post_detail_text"
@@ -276,7 +280,7 @@
             app:iconPadding="12dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_detail_text"
+            app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_detail_text"
             style="?attr/materialIconButtonOutlinedStyle" />
 
         <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml b/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml
index 8a7c8044..f6caee7b 100644
--- a/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml
+++ b/app/src/main/res/layout/item_post_detail_video_and_gif_preview.xml
@@ -271,45 +271,49 @@
         android:paddingStart="8dp"
         android:paddingEnd="8dp">
 
-        <com.google.android.material.button.MaterialButtonToggleGroup
-            android:id="@+id/vote_button_toggle_item_post_detail_video_and_gif_preview"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:singleSelection="true"
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            android:id="@+id/upvote_button_item_post_detail_video_and_gif_preview"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_upvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
+            app:layout_constraintTop_toTopOf="parent" />
 
-            <com.google.android.material.button.MaterialButton
-                style="?attr/materialButtonOutlinedStyle"
-                android:id="@+id/upvote_button_item_post_detail_video_and_gif_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_detail_video_and_gif_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" />
+        <TextView
+            android:id="@+id/score_text_view_item_post_detail_video_and_gif_preview"
+            android:layout_width="64dp"
+            android:layout_height="wrap_content"
+            android:fontFamily="?attr/font_family"
+            android:gravity="center"
+            android:textSize="?attr/font_12"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/upvote_button_item_post_detail_video_and_gif_preview"
+            app:layout_constraintTop_toTopOf="parent" />
 
-        </com.google.android.material.button.MaterialButtonToggleGroup>
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            android:id="@+id/downvote_button_item_post_detail_video_and_gif_preview"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_downvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_detail_video_and_gif_preview"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/comments_count_button_item_post_detail_video_and_gif_preview"
@@ -328,7 +332,7 @@
             app:iconPadding="12dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_detail_video_and_gif_preview"
+            app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_detail_video_and_gif_preview"
             style="?attr/materialIconButtonOutlinedStyle" />
 
         <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/item_post_detail_video_autoplay.xml b/app/src/main/res/layout/item_post_detail_video_autoplay.xml
index 69af5ffd..c5494153 100644
--- a/app/src/main/res/layout/item_post_detail_video_autoplay.xml
+++ b/app/src/main/res/layout/item_post_detail_video_autoplay.xml
@@ -252,45 +252,49 @@
         android:paddingStart="8dp"
         android:paddingEnd="8dp">
 
-        <com.google.android.material.button.MaterialButtonToggleGroup
-            android:id="@+id/vote_button_toggle_item_post_detail_video_autoplay"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:singleSelection="true"
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            android:id="@+id/upvote_button_item_post_detail_video_autoplay"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_upvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
-
-            <com.google.android.material.button.MaterialButton
-                style="?attr/materialButtonOutlinedStyle"
-                android:id="@+id/upvote_button_item_post_detail_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_detail_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>
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/score_text_view_item_post_detail_video_autoplay"
+            android:layout_width="64dp"
+            android:layout_height="wrap_content"
+            android:fontFamily="?attr/font_family"
+            android:gravity="center"
+            android:textSize="?attr/font_12"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/upvote_button_item_post_detail_video_autoplay"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            android:id="@+id/downvote_button_item_post_detail_video_autoplay"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_downvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_detail_video_autoplay"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/comments_count_button_item_post_detail_video_autoplay"
@@ -309,7 +313,7 @@
             app:iconPadding="12dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_detail_video_autoplay"
+            app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_detail_video_autoplay"
             style="?attr/materialIconButtonOutlinedStyle" />
 
         <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml b/app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml
index 36400f28..5f68e177 100644
--- a/app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml
+++ b/app/src/main/res/layout/item_post_detail_video_autoplay_legacy_controller.xml
@@ -253,45 +253,49 @@
         android:paddingStart="8dp"
         android:paddingEnd="8dp">
 
-        <com.google.android.material.button.MaterialButtonToggleGroup
-            android:id="@+id/vote_button_toggle_item_post_detail_video_autoplay"
-            android:layout_width="0dp"
-            android:layout_height="wrap_content"
-            app:singleSelection="true"
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            android:id="@+id/upvote_button_item_post_detail_video_autoplay"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_upvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintStart_toStartOf="parent"
-            app:layout_constraintTop_toTopOf="parent"
-            app:layout_constraintBottom_toBottomOf="parent">
-
-            <com.google.android.material.button.MaterialButton
-                style="?attr/materialButtonOutlinedStyle"
-                android:id="@+id/upvote_button_item_post_detail_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_detail_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>
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <TextView
+            android:id="@+id/score_text_view_item_post_detail_video_autoplay"
+            android:layout_width="64dp"
+            android:layout_height="wrap_content"
+            android:fontFamily="?attr/font_family"
+            android:gravity="center"
+            android:textSize="?attr/font_12"
+            android:textStyle="bold"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/upvote_button_item_post_detail_video_autoplay"
+            app:layout_constraintTop_toTopOf="parent" />
+
+        <com.google.android.material.button.MaterialButton
+            style="?attr/materialIconButtonStyle"
+            android:id="@+id/downvote_button_item_post_detail_video_autoplay"
+            android:layout_width="wrap_content"
+            android:layout_height="match_parent"
+            android:paddingStart="8dp"
+            android:paddingEnd="8dp"
+            android:minWidth="0dp"
+            android:backgroundTint="#00000000"
+            app:strokeWidth="0dp"
+            app:icon="@drawable/ic_downvote_24dp"
+            app:iconSize="24dp"
+            app:layout_constraintBottom_toBottomOf="parent"
+            app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_detail_video_autoplay"
+            app:layout_constraintTop_toTopOf="parent" />
 
         <com.google.android.material.button.MaterialButton
             android:id="@+id/comments_count_button_item_post_detail_video_autoplay"
@@ -310,7 +314,7 @@
             app:iconPadding="12dp"
             app:layout_constraintTop_toTopOf="parent"
             app:layout_constraintBottom_toBottomOf="parent"
-            app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_detail_video_autoplay"
+            app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_detail_video_autoplay"
             style="?attr/materialIconButtonOutlinedStyle" />
 
         <com.google.android.material.button.MaterialButton
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 96433b2a..b1ba5d4b 100644
--- a/app/src/main/res/layout/item_post_gallery_type.xml
+++ b/app/src/main/res/layout/item_post_gallery_type.xml
@@ -237,45 +237,49 @@
             android:paddingStart="8dp"
             android:paddingEnd="8dp">
 
-            <com.google.android.material.button.MaterialButtonToggleGroup
-                android:id="@+id/vote_button_toggle_item_post_gallery_type"
-                android:layout_width="0dp"
+            <com.google.android.material.button.MaterialButton
+                style="?attr/materialIconButtonStyle"
+                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:backgroundTint="#00000000"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_upvote_24dp"
+                app:iconSize="24dp"
+                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"
-                app:singleSelection="true"
-                app:layout_constraintStart_toStartOf="parent"
+                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">
-
-                <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>
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@id/upvote_button_item_post_gallery_type" />
+
+            <com.google.android.material.button.MaterialButton
+                style="?attr/materialIconButtonStyle"
+                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"
+                android:backgroundTint="#00000000"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_downvote_24dp"
+                app:iconSize="24dp"
+                app:layout_constraintTop_toTopOf="parent"
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_gallery_type" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/comments_count_button_item_post_gallery_type"
@@ -294,7 +298,7 @@
                 app:iconPadding="12dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_gallery_type"
+                app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_gallery_type"
                 style="?attr/materialIconButtonOutlinedStyle" />
 
             <com.google.android.material.button.MaterialButton
diff --git a/app/src/main/res/layout/item_post_text.xml b/app/src/main/res/layout/item_post_text.xml
index 04888639..acd9d288 100644
--- a/app/src/main/res/layout/item_post_text.xml
+++ b/app/src/main/res/layout/item_post_text.xml
@@ -216,45 +216,49 @@
             android:paddingStart="8dp"
             android:paddingEnd="8dp">
 
-            <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"
-                app:singleSelection="true"
-                app:layout_constraintStart_toStartOf="parent"
+            <com.google.android.material.button.MaterialButton
+                style="?attr/materialIconButtonStyle"
+                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:backgroundTint="#00000000"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_upvote_24dp"
+                app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
-                app:layout_constraintBottom_toBottomOf="parent">
-
-                <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" />
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toStartOf="parent" />
 
-                <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/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/upvote_button_item_post_text_type" />
 
-            </com.google.android.material.button.MaterialButtonToggleGroup>
+            <com.google.android.material.button.MaterialButton
+                style="?attr/materialIconButtonStyle"
+                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"
+                android:backgroundTint="#00000000"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_downvote_24dp"
+                app:iconSize="24dp"
+                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
                 android:id="@+id/comments_count_button_item_post_text_type"
@@ -273,7 +277,7 @@
                 app:iconPadding="12dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_text_type"
+                app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_text_type"
                 style="?attr/materialIconButtonOutlinedStyle" />
 
             <com.google.android.material.button.MaterialButton
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 cd4c7b2d..7f0b6835 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
@@ -237,45 +237,49 @@
             android:paddingStart="8dp"
             android:paddingEnd="8dp">
 
-            <com.google.android.material.button.MaterialButtonToggleGroup
-                android:id="@+id/vote_button_toggle_item_post_video_type_autoplay"
-                android:layout_width="0dp"
+            <com.google.android.material.button.MaterialButton
+                style="?attr/materialIconButtonStyle"
+                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:backgroundTint="#00000000"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_upvote_24dp"
+                app:iconSize="24dp"
+                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"
-                app:singleSelection="true"
-                app:layout_constraintStart_toStartOf="parent"
+                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/upvote_button_item_post_video_type_autoplay" />
+
+            <com.google.android.material.button.MaterialButton
+                style="?attr/materialIconButtonStyle"
+                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"
+                android:backgroundTint="#00000000"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_downvote_24dp"
+                app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
-                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>
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_video_type_autoplay" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/comments_count_button_item_post_video_type_autoplay"
@@ -294,7 +298,7 @@
                 app:iconPadding="12dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_video_type_autoplay"
+                app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_video_type_autoplay"
                 style="?attr/materialIconButtonOutlinedStyle" />
 
             <com.google.android.material.button.MaterialButton
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 92195e89..5b11444a 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
@@ -237,45 +237,49 @@
             android:paddingStart="8dp"
             android:paddingEnd="8dp">
 
-            <com.google.android.material.button.MaterialButtonToggleGroup
-                android:id="@+id/vote_button_toggle_item_post_video_type_autoplay"
-                android:layout_width="0dp"
+            <com.google.android.material.button.MaterialButton
+                style="?attr/materialIconButtonStyle"
+                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:backgroundTint="#00000000"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_upvote_24dp"
+                app:iconSize="24dp"
+                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"
-                app:singleSelection="true"
-                app:layout_constraintStart_toStartOf="parent"
+                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/upvote_button_item_post_video_type_autoplay" />
+
+            <com.google.android.material.button.MaterialButton
+                style="?attr/materialIconButtonStyle"
+                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"
+                android:backgroundTint="#00000000"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_downvote_24dp"
+                app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
-                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>
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_video_type_autoplay" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/comments_count_button_item_post_video_type_autoplay"
@@ -294,7 +298,7 @@
                 app:iconPadding="12dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_video_type_autoplay"
+                app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_video_type_autoplay"
                 style="?attr/materialIconButtonOutlinedStyle" />
 
             <com.google.android.material.button.MaterialButton
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 468cc882..880487fd 100644
--- a/app/src/main/res/layout/item_post_with_preview.xml
+++ b/app/src/main/res/layout/item_post_with_preview.xml
@@ -261,45 +261,49 @@
             android:paddingStart="8dp"
             android:paddingEnd="8dp">
 
-            <com.google.android.material.button.MaterialButtonToggleGroup
-                android:id="@+id/vote_button_toggle_item_post_with_preview"
-                android:layout_width="0dp"
+            <com.google.android.material.button.MaterialButton
+                style="?attr/materialIconButtonStyle"
+                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:backgroundTint="#00000000"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_upvote_24dp"
+                app:iconSize="24dp"
+                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"
-                app:singleSelection="true"
-                app:layout_constraintStart_toStartOf="parent"
+                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/upvote_button_item_post_with_preview" />
+
+            <com.google.android.material.button.MaterialButton
+                style="?attr/materialIconButtonStyle"
+                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"
+                android:backgroundTint="#00000000"
+                app:strokeWidth="0dp"
+                app:icon="@drawable/ic_downvote_24dp"
+                app:iconSize="24dp"
                 app:layout_constraintTop_toTopOf="parent"
-                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>
+                app:layout_constraintBottom_toBottomOf="parent"
+                app:layout_constraintStart_toEndOf="@id/score_text_view_item_post_with_preview" />
 
             <com.google.android.material.button.MaterialButton
                 android:id="@+id/comments_count_button_item_post_with_preview"
@@ -318,7 +322,7 @@
                 app:iconPadding="12dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
-                app:layout_constraintStart_toEndOf="@id/vote_button_toggle_item_post_with_preview"
+                app:layout_constraintStart_toEndOf="@id/downvote_button_item_post_with_preview"
                 style="?attr/materialIconButtonOutlinedStyle" />
 
             <com.google.android.material.button.MaterialButton
-- 
cgit v1.2.3