diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/RedditGallerySubmissionRecyclerViewAdapter.java b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/RedditGallerySubmissionRecyclerViewAdapter.java
index e585f2f7..cda083f8 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/RedditGallerySubmissionRecyclerViewAdapter.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/adapters/RedditGallerySubmissionRecyclerViewAdapter.java
@@ -193,7 +193,7 @@ public class RedditGallerySubmissionRecyclerViewAdapter extends RecyclerView.Ada
             super(itemView);
 
             FloatingActionButton fab = itemView.findViewById(R.id.fab_item_gallery_submission_add_image);
-            fab.setBackgroundTintList(ColorStateList.valueOf(customThemeWrapper.getColorPrimaryLightTheme()));
+            fab.setBackgroundTintList(ColorStateList.valueOf(customThemeWrapper.getColorAccent()));
             fab.setImageTintList(ColorStateList.valueOf(customThemeWrapper.getFABIconColor()));
 
             itemView.getViewTreeObserver().addOnGlobalLayoutListener(new ViewTreeObserver.OnGlobalLayoutListener() {
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeWrapper.java b/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeWrapper.java
index 3e2f9d1a..04a32281 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeWrapper.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/customtheme/CustomThemeWrapper.java
@@ -868,7 +868,7 @@ public class CustomThemeWrapper {
         customTheme.commentVerticalBarColor5 = Color.parseColor("#EE0220");
         customTheme.commentVerticalBarColor6 = Color.parseColor("#02EE6E");
         customTheme.commentVerticalBarColor7 = Color.parseColor("#EE4602");
-        customTheme.fabIconColor = Color.parseColor("#000000");
+        customTheme.fabIconColor = Color.parseColor("#FFFFFF");
         customTheme.chipTextColor = Color.parseColor("#FFFFFF");
         customTheme.linkColor = Color.parseColor("#FF1868");
         customTheme.receivedMessageTextColor = Color.parseColor("#FFFFFF");
@@ -961,7 +961,7 @@ public class CustomThemeWrapper {
         customTheme.commentVerticalBarColor5 = Color.parseColor("#EE0219");
         customTheme.commentVerticalBarColor6 = Color.parseColor("#00B925");
         customTheme.commentVerticalBarColor7 = Color.parseColor("#EE4602");
-        customTheme.fabIconColor = Color.parseColor("#FFFFFF");
+        customTheme.fabIconColor = Color.parseColor("#000000");
         customTheme.chipTextColor = Color.parseColor("#FFFFFF");
         customTheme.linkColor = Color.parseColor("#FF1868");
         customTheme.receivedMessageTextColor = Color.parseColor("#FFFFFF");
@@ -1054,7 +1054,7 @@ public class CustomThemeWrapper {
         customTheme.commentVerticalBarColor5 = Color.parseColor("#EE0219");
         customTheme.commentVerticalBarColor6 = Color.parseColor("#00B925");
         customTheme.commentVerticalBarColor7 = Color.parseColor("#EE4602");
-        customTheme.fabIconColor = Color.parseColor("#FFFFFF");
+        customTheme.fabIconColor = Color.parseColor("#000000");
         customTheme.chipTextColor = Color.parseColor("#FFFFFF");
         customTheme.linkColor = Color.parseColor("#FF1868");
         customTheme.receivedMessageTextColor = Color.parseColor("#FFFFFF");
@@ -1426,7 +1426,7 @@ public class CustomThemeWrapper {
         customTheme.commentVerticalBarColor5 = Color.parseColor("#BD93F9");
         customTheme.commentVerticalBarColor6 = Color.parseColor("#FF5555");
         customTheme.commentVerticalBarColor7 = Color.parseColor("#F1FA8C");
-        customTheme.fabIconColor = Color.parseColor("#FFFFFF");
+        customTheme.fabIconColor = Color.parseColor("#000000");
         customTheme.chipTextColor = Color.parseColor("#FFFFFF");
         customTheme.linkColor = Color.parseColor("#FF1868");
         customTheme.receivedMessageTextColor = Color.parseColor("#FFFFFF");
diff --git a/app/src/main/java/ml/docilealligator/infinityforreddit/utils/MaterialYouUtils.java b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/MaterialYouUtils.java
index ec663db8..010a8033 100644
--- a/app/src/main/java/ml/docilealligator/infinityforreddit/utils/MaterialYouUtils.java
+++ b/app/src/main/java/ml/docilealligator/infinityforreddit/utils/MaterialYouUtils.java
@@ -99,7 +99,7 @@ public class MaterialYouUtils {
             lightTheme.navBarColor = lightTheme.colorPrimary;
             lightTheme.primaryTextColor = context.getColor(android.R.color.system_neutral1_900);
             lightTheme.secondaryTextColor = context.getColor(android.R.color.system_neutral1_700);
-            lightTheme.buttonTextColor = context.getColor(android.R.color.system_accent1_800);
+            lightTheme.buttonTextColor = lightTheme.primaryTextColor;
             lightTheme.bottomAppBarIconColor = lightTheme.buttonTextColor;
             lightTheme.primaryIconColor = context.getColor(android.R.color.system_accent1_400);
             lightTheme.fabIconColor = lightTheme.buttonTextColor;
@@ -120,7 +120,7 @@ public class MaterialYouUtils {
             darkTheme.colorPrimary = context.getColor(android.R.color.system_accent2_800);
             darkTheme.colorPrimaryDark = darkTheme.colorPrimary;
             darkTheme.colorAccent = context.getColor(android.R.color.system_accent3_100);
-            darkTheme.colorPrimaryLightTheme = context.getColor(android.R.color.system_accent1_300);
+            darkTheme.colorPrimaryLightTheme = lightTheme.colorPrimary;
             darkTheme.backgroundColor = context.getColor(android.R.color.system_neutral1_900);
             darkTheme.cardViewBackgroundColor = context.getColor(android.R.color.system_neutral2_800);
             darkTheme.commentBackgroundColor = darkTheme.cardViewBackgroundColor;
@@ -129,6 +129,7 @@ public class MaterialYouUtils {
             darkTheme.navBarColor = darkTheme.colorPrimary;
             darkTheme.primaryTextColor = context.getColor(android.R.color.system_neutral1_10);
             darkTheme.secondaryTextColor = context.getColor(android.R.color.system_neutral1_10);
+            darkTheme.buttonTextColor = context.getColor(android.R.color.system_neutral1_900);
             darkTheme.bottomAppBarIconColor = context.getColor(android.R.color.system_accent1_100);
             darkTheme.primaryIconColor = context.getColor(android.R.color.system_accent1_100);
             darkTheme.fabIconColor = context.getColor(android.R.color.system_neutral1_900);
@@ -146,7 +147,7 @@ public class MaterialYouUtils {
             darkTheme.name = "Material You Dark";
 
             amoledTheme.colorAccent = context.getColor(android.R.color.system_accent1_100);
-            amoledTheme.colorPrimaryLightTheme = context.getColor(android.R.color.system_accent1_300);
+            amoledTheme.colorPrimaryLightTheme = lightTheme.colorPrimary;
             amoledTheme.fabIconColor = context.getColor(android.R.color.system_neutral1_900);
             amoledTheme.name = "Material You Amoled";