diff --git a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
index c7f1524da..1889f0ece 100644
--- a/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
+++ b/app/src/main/java/com/keylesspalace/tusky/ComposeActivity.java
@@ -506,8 +506,7 @@ public class ComposeActivity extends BaseActivity {
             }
             case "private": {
                 floatingBtn.setText(R.string.action_send);
-                Drawable lock = ThemeUtils.getDrawable(this, R.attr.compose_send_private_drawable,
-                        R.drawable.send_private_dark);
+                Drawable lock = ContextCompat.getDrawable(this, R.drawable.send_private);
                 lock.setBounds(0, 0, lock.getIntrinsicWidth(), lock.getIntrinsicHeight());
                 floatingBtn.setCompoundDrawables(null, null, lock, null);
                 break;
diff --git a/app/src/main/res/drawable/send_private_dark.xml b/app/src/main/res/drawable/send_private.xml
similarity index 100%
rename from app/src/main/res/drawable/send_private_dark.xml
rename to app/src/main/res/drawable/send_private.xml
diff --git a/app/src/main/res/drawable/send_private_light.xml b/app/src/main/res/drawable/send_private_light.xml
deleted file mode 100644
index eb698a943..000000000
--- a/app/src/main/res/drawable/send_private_light.xml
+++ /dev/null
@@ -1,9 +0,0 @@
-<vector xmlns:android="http://schemas.android.com/apk/res/android"
-android:width="24dp"
-android:height="24dp"
-android:viewportWidth="24.0"
-android:viewportHeight="24.0">
-<path
-    android:fillColor="@color/text_color_primary_light"
-    android:pathData="M18,8h-1L17,6c0,-2.76 -2.24,-5 -5,-5S7,3.24 7,6v2L6,8c-1.1,0 -2,0.9 -2,2v10c0,1.1 0.9,2 2,2h12c1.1,0 2,-0.9 2,-2L20,10c0,-1.1 -0.9,-2 -2,-2zM12,17c-1.1,0 -2,-0.9 -2,-2s0.9,-2 2,-2 2,0.9 2,2 -0.9,2 -2,2zM15.1,8L8.9,8L8.9,6c0,-1.71 1.39,-3.1 3.1,-3.1 1.71,0 3.1,1.39 3.1,3.1v2z"/>
-</vector>
diff --git a/app/src/main/res/layout/activity_compose.xml b/app/src/main/res/layout/activity_compose.xml
index f5bbb3f93..e3620fef3 100644
--- a/app/src/main/res/layout/activity_compose.xml
+++ b/app/src/main/res/layout/activity_compose.xml
@@ -127,7 +127,8 @@
                 android:layout_width="wrap_content"
                 android:layout_height="wrap_content"
                 android:layout_marginLeft="10dp"
-                android:text="@string/action_send" />
+                android:text="@string/action_send"
+                android:textColor="@android:color/white" />
         </LinearLayout>
     </LinearLayout>
 
diff --git a/app/src/main/res/layout/activity_login.xml b/app/src/main/res/layout/activity_login.xml
index 27d855498..7eb95cbe3 100644
--- a/app/src/main/res/layout/activity_login.xml
+++ b/app/src/main/res/layout/activity_login.xml
@@ -37,6 +37,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="4dp"
             android:elevation="0dp"
+            android:textColor="@android:color/white"
             android:text="@string/action_login" />
 
         <TextView
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index dad2758ea..0b1e3b2de 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -35,7 +35,6 @@
     <attr name="compose_media_button_disabled_tint" format="reference|color" />
     <attr name="compose_mention_color" format="reference|color" />
     <attr name="compose_content_warning_bar_background" format="reference" />
-    <attr name="compose_send_private_drawable" format="reference" />
     <attr name="compose_nsfw_button_color" format="reference|color" />
     <attr name="compose_nsfw_button_selected_color" format="reference|color" />
     <attr name="report_status_background_color" format="reference|color" />
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index d6f58e08e..a6454085f 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -60,7 +60,6 @@
         <item name="compose_media_button_disabled_tint">@color/compose_media_button_disabled_dark</item>
         <item name="compose_mention_color">@color/color_accent_dark</item>
         <item name="compose_content_warning_bar_background">@drawable/border_background_dark</item>
-        <item name="compose_send_private_drawable">@drawable/send_private_dark</item>
         <item name="compose_nsfw_button_color">@color/image_button_dark</item>
         <item name="compose_nsfw_button_selected_color">@color/color_accent_dark</item>
         <item name="report_status_background_color">@color/color_background_dark</item>
@@ -147,7 +146,6 @@
         <item name="compose_media_button_disabled_tint">@color/compose_media_button_disabled_light</item>
         <item name="compose_mention_color">@color/compose_mention_light</item>
         <item name="compose_content_warning_bar_background">@drawable/border_background_light</item>
-        <item name="compose_send_private_drawable">@drawable/send_private_light</item>
         <item name="compose_nsfw_button_color">@color/image_button_light</item>
         <item name="compose_nsfw_button_selected_color">@color/color_accent_light</item>
         <item name="report_status_background_color">@color/report_status_background_light</item>