diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/color/Colors.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/color/Colors.kt
index f453afc239..71a9dc9a25 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ui/color/Colors.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ui/color/Colors.kt
@@ -41,20 +41,8 @@ interface Colors {
     val backgroundBubbleSent: Color get() = primary
     val qrCodeContent: Color
     val qrCodeBackground: Color
-
-    // buttonFill
-    val buttonFill: Color get() = text
-    val buttonFillText: Color get() = background
-
-    // primaryButtonFill
     val primaryButtonFill: Color
     val primaryButtonFillText: Color
-
-    // buttonOutline
-    val buttonOutline get() = text
-
-    // primaryButtonOutline
-    val primaryButtonOutline get() = primaryButtonFill
 }
 
 val Colors.textSelectionColors get() = TextSelectionColors(
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/components/Button.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/components/Button.kt
index c61804a0ff..5784b22fbd 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ui/components/Button.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ui/components/Button.kt
@@ -141,7 +141,7 @@ fun Button(
 }
 
 @Composable fun SlimPrimaryOutlineButton(text: String, modifier: Modifier = Modifier, enabled: Boolean = true, onClick: () -> Unit) {
-    Button(text, onClick, ButtonType.Outline(LocalColors.current.primaryButtonOutline), modifier, enabled, ButtonStyle.Slim)
+    Button(text, onClick, ButtonType.Outline(LocalColors.current.primaryButtonFill), modifier, enabled, ButtonStyle.Slim)
 }
 
 @Composable
@@ -150,7 +150,7 @@ fun PrimaryOutlineCopyButton(
     style: ButtonStyle = ButtonStyle.Large,
     onClick: () -> Unit
 ) {
-    OutlineCopyButton(modifier, style, LocalColors.current.primaryButtonOutline, onClick)
+    OutlineCopyButton(modifier, style, LocalColors.current.primaryButtonFill, onClick)
 }
 
 @Composable
@@ -307,7 +307,7 @@ private fun VariousButtons(
             OutlineButton("Outline Button Disabled", enabled = false) {}
             SlimOutlineButton("Slim Outline") {}
             SlimOutlineButton("Slim Outline Disabled", enabled = false) {}
-            SlimOutlineButton("Slim Primary", color = LocalColors.current.primaryButtonFill) {}
+            SlimPrimaryOutlineButton("Slim Primary") {}
             SlimOutlineButton("Slim Danger", color = LocalColors.current.danger) {}
             BorderlessButton("Borderless Button") {}
             BorderlessButton("Borderless Secondary", color = LocalColors.current.textSecondary) {}
diff --git a/app/src/main/java/org/thoughtcrime/securesms/ui/components/ButtonType.kt b/app/src/main/java/org/thoughtcrime/securesms/ui/components/ButtonType.kt
index 03c66a020a..c9113c55fe 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/ui/components/ButtonType.kt
+++ b/app/src/main/java/org/thoughtcrime/securesms/ui/components/ButtonType.kt
@@ -44,7 +44,7 @@ interface ButtonType {
         @Composable
         override fun buttonColors() = ButtonDefaults.buttonColors(
             contentColor = LocalColors.current.background,
-            backgroundColor = LocalColors.current.buttonFill,
+            backgroundColor = LocalColors.current.text,
             disabledContentColor = LocalColors.current.disabled,
             disabledBackgroundColor = Color.Unspecified
         )