diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java
index cd2e141d..36b33332 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/PostRecyclerViewAdapter.java
@@ -197,6 +197,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
     private int mVoteAndReplyUnavailableVoteButtonColor;
     private int mPostIconAndInfoColor;
     private int mDividerColor;
+    private int mButtonBackgroundColor;
     private float mScale;
     private boolean mDisplaySubredditName;
     private boolean mVoteButtonsOnTheRight;
@@ -354,6 +355,7 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
             mVoteAndReplyUnavailableVoteButtonColor = customThemeWrapper.getVoteAndReplyUnavailableButtonColor();
             mPostIconAndInfoColor = customThemeWrapper.getPostIconAndInfoColor();
             mDividerColor = customThemeWrapper.getDividerColor();
+            mButtonBackgroundColor = Color.parseColor("#FFFFFF");
 
             mCommentIcon = AppCompatResources.getDrawable(activity, R.drawable.ic_comment_grey_24dp);
             if (mCommentIcon != null) {
@@ -5959,12 +5961,17 @@ public class PostRecyclerViewAdapter extends PagingDataAdapter<Post, RecyclerVie
             archivedImageView.setColorFilter(mArchivedIconTint, PorterDuff.Mode.SRC_IN);
             lockedImageView.setColorFilter(mLockedIconTint, PorterDuff.Mode.SRC_IN);
             crosspostImageView.setColorFilter(mCrosspostIconTint, PorterDuff.Mode.SRC_IN);
+            upvoteButton.setBackgroundTintList(ColorStateList.valueOf(mButtonBackgroundColor));
             upvoteButton.setIconTint(ColorStateList.valueOf(mPostIconAndInfoColor));
+            downvoteButton.setBackgroundTintList(ColorStateList.valueOf(mButtonBackgroundColor));
             downvoteButton.setIconTint(ColorStateList.valueOf(mPostIconAndInfoColor));
+            //commentsCountButton.setBackgroundTintList(ColorStateList.valueOf(mButtonBackgroundColor));
             commentsCountButton.setTextColor(mPostIconAndInfoColor);
-            //commentsCountButton.setIcon(mCommentIcon);
+            commentsCountButton.setIcon(mCommentIcon);
             //commentsCountButton.setIconTint(ColorStateList.valueOf(mPostIconAndInfoColor));
+            //saveButton.setBackgroundTintList(ColorStateList.valueOf(mButtonBackgroundColor));
             saveButton.setIconTint(ColorStateList.valueOf(mPostIconAndInfoColor));
+            //shareButton.setBackgroundTintList(ColorStateList.valueOf(mButtonBackgroundColor));
             shareButton.setIconTint(ColorStateList.valueOf(mPostIconAndInfoColor));
 
             itemView.setOnClickListener(view -> {
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 f68050b0..268f5933 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
@@ -257,8 +257,7 @@
             android:id="@+id/bottom_constraint_layout_item_post_with_preview"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:paddingStart="8dp"
-            android:paddingEnd="8dp">
+            android:padding="8dp">
 
             <com.google.android.material.button.MaterialButtonToggleGroup
                 android:id="@+id/vote_button_toggle_item_post_card_3_with_preview"
@@ -279,6 +278,7 @@
                     android:textSize="?attr/font_12"
                     android:textStyle="bold"
                     android:fontFamily="?attr/font_family"
+                    app:strokeWidth="0dp"
                     app:icon="@drawable/ic_arrow_upward_grey_24dp" />
 
                 <com.google.android.material.button.MaterialButton
@@ -289,6 +289,7 @@
                     android:paddingStart="8dp"
                     android:paddingEnd="8dp"
                     android:minWidth="0dp"
+                    app:strokeWidth="0dp"
                     app:icon="@drawable/ic_arrow_downward_grey_24dp" />
 
             </com.google.android.material.button.MaterialButtonToggleGroup>
@@ -296,7 +297,7 @@
             <com.google.android.material.button.MaterialButton
                 style="?attr/materialButtonOutlinedStyle"
                 android:id="@+id/comments_count_button_item_post_with_preview"
-                android:layout_width="0dp"
+                android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginStart="16dp"
                 android:paddingStart="8dp"
@@ -305,6 +306,7 @@
                 android:textSize="?attr/font_12"
                 android:textStyle="bold"
                 android:fontFamily="?attr/font_family"
+                app:strokeWidth="0dp"
                 app:iconTint="@null"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -315,6 +317,7 @@
                 android:id="@+id/save_button_item_post_with_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                app:strokeWidth="0dp"
                 app:layout_constraintHorizontal_bias="1"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"
@@ -326,6 +329,7 @@
                 android:id="@+id/share_button_item_post_with_preview"
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
+                app:strokeWidth="0dp"
                 app:icon="@drawable/ic_share_grey_24dp"
                 app:layout_constraintTop_toTopOf="parent"
                 app:layout_constraintBottom_toBottomOf="parent"