diff --git a/app/src/main/res/drawable/ic_share_solid_24.xml b/app/src/main/res/drawable/ic_share_solid_24_dark.xml
similarity index 87%
rename from app/src/main/res/drawable/ic_share_solid_24.xml
rename to app/src/main/res/drawable/ic_share_solid_24_dark.xml
index 06458017ca..5f97a4c2a6 100644
--- a/app/src/main/res/drawable/ic_share_solid_24.xml
+++ b/app/src/main/res/drawable/ic_share_solid_24_dark.xml
@@ -4,6 +4,6 @@
     android:viewportWidth="24"
     android:viewportHeight="24">
   <path
-      android:fillColor="@color/core_ultramarine"
+      android:fillColor="@color/core_ultramarine_light"
       android:pathData="M17,15a2.98,2.98 0,0 0,-2.184 0.955L8.9,12.728a2.726,2.726 0,0 0,0 -1.456l5.915,-3.227A3.1,3.1 0,1 0,14.1 6.728L8.184,9.955a3,3 0,1 0,0 4.09L14.1,17.272A2.995,2.995 0,1 0,17 15Z"/>
 </vector>
diff --git a/app/src/main/res/layout/account_locked_fragment.xml b/app/src/main/res/layout/account_locked_fragment.xml
index 2b65b940e2..726fd6e01a 100644
--- a/app/src/main/res/layout/account_locked_fragment.xml
+++ b/app/src/main/res/layout/account_locked_fragment.xml
@@ -48,7 +48,7 @@
 
     <Button
         android:id="@+id/account_locked_learn_more"
-        style="@style/Widget.AppCompat.Button.Borderless.Colored"
+        style="@style/Button.Borderless"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="32dp"
diff --git a/app/src/main/res/layout/activity_shared_contact_details.xml b/app/src/main/res/layout/activity_shared_contact_details.xml
index 33c73f92ff..04040fc0b3 100644
--- a/app/src/main/res/layout/activity_shared_contact_details.xml
+++ b/app/src/main/res/layout/activity_shared_contact_details.xml
@@ -97,14 +97,14 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginBottom="6dp"
-                                android:tint="@color/core_ultramarine"
+                                android:tint="?attr/colorAccent"
                                 android:src="@drawable/message_24dp"/>
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@string/SharedContactDetailsActivity_signal_message"
-                                android:textColor="@color/core_ultramarine"/>
+                                android:textColor="?attr/colorAccent"/>
 
                         </LinearLayout>
 
@@ -121,14 +121,14 @@
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:layout_marginBottom="6dp"
-                                android:tint="@color/core_ultramarine"
+                                android:tint="?attr/colorAccent"
                                 android:src="@drawable/phone_24dp"/>
 
                             <TextView
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:text="@string/SharedContactDetailsActivity_signal_call"
-                                android:textColor="@color/core_ultramarine"/>
+                                android:textColor="?attr/colorAccent"/>
 
                         </LinearLayout>
 
diff --git a/app/src/main/res/layout/base_kbs_pin_fragment.xml b/app/src/main/res/layout/base_kbs_pin_fragment.xml
index a5e365b08a..87e0e7cdf4 100644
--- a/app/src/main/res/layout/base_kbs_pin_fragment.xml
+++ b/app/src/main/res/layout/base_kbs_pin_fragment.xml
@@ -83,7 +83,7 @@
 
         <Button
             android:id="@+id/edit_kbs_pin_keyboard_toggle"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            style="@style/Button.Borderless"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
diff --git a/app/src/main/res/layout/fragment_registration_lock.xml b/app/src/main/res/layout/fragment_registration_lock.xml
index 7323671976..d1617f02e0 100644
--- a/app/src/main/res/layout/fragment_registration_lock.xml
+++ b/app/src/main/res/layout/fragment_registration_lock.xml
@@ -61,20 +61,19 @@
 
         <Button
             android:id="@+id/kbs_lock_forgot_pin"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            style="@style/Button.Borderless"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
             android:layout_marginEnd="32dp"
             android:text="@string/RegistrationLockFragment__forgot_pin"
-            android:textColor="@color/core_ultramarine"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
             app:layout_constraintTop_toBottomOf="@id/kbs_lock_pin_input_label" />
 
         <Button
             android:id="@+id/kbs_lock_keyboard_toggle"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            style="@style/Button.Borderless"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
diff --git a/app/src/main/res/layout/help_fragment.xml b/app/src/main/res/layout/help_fragment.xml
index 01b84fd3ee..0856500ecd 100644
--- a/app/src/main/res/layout/help_fragment.xml
+++ b/app/src/main/res/layout/help_fragment.xml
@@ -77,7 +77,6 @@
                 android:text="@string/HelpFragment__whats_this"
                 android:textAllCaps="false"
                 android:textAppearance="@style/Signal.Text.Body"
-                android:textColor="@color/core_ultramarine"
                 android:textSize="14sp"
                 app:layout_constraintEnd_toEndOf="parent"
                 app:layout_constraintHorizontal_bias="0"
diff --git a/app/src/main/res/layout/invite_activity.xml b/app/src/main/res/layout/invite_activity.xml
index 4894008fbb..fb50f42a84 100644
--- a/app/src/main/res/layout/invite_activity.xml
+++ b/app/src/main/res/layout/invite_activity.xml
@@ -114,7 +114,7 @@
                       android:orientation="horizontal">
 
             <Button android:id="@+id/cancel_sms_button"
-                    style="@style/Widget.AppCompat.Button.Borderless"
+                    style="@style/Button.Borderless"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:text="@string/InviteActivity_cancel" />
diff --git a/app/src/main/res/layout/pin_restore_entry_fragment.xml b/app/src/main/res/layout/pin_restore_entry_fragment.xml
index a32ce5c663..a0b4d92eff 100644
--- a/app/src/main/res/layout/pin_restore_entry_fragment.xml
+++ b/app/src/main/res/layout/pin_restore_entry_fragment.xml
@@ -61,13 +61,12 @@
 
         <Button
             android:id="@+id/pin_restore_forgot_pin"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            style="@style/Button.Borderless"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
             android:layout_marginEnd="32dp"
             android:text="@string/PinRestoreEntryFragment_need_help"
-            android:textColor="@color/core_ultramarine"
             android:visibility="gone"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent"
@@ -76,7 +75,7 @@
 
         <Button
             android:id="@+id/pin_restore_keyboard_toggle"
-            style="@style/Widget.AppCompat.Button.Borderless.Colored"
+            style="@style/Button.Borderless"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
             android:layout_marginStart="32dp"
diff --git a/app/src/main/res/layout/pin_restore_locked_fragment.xml b/app/src/main/res/layout/pin_restore_locked_fragment.xml
index bb2171d3c8..981f8d8a64 100644
--- a/app/src/main/res/layout/pin_restore_locked_fragment.xml
+++ b/app/src/main/res/layout/pin_restore_locked_fragment.xml
@@ -49,7 +49,7 @@
 
     <Button
         android:id="@+id/pin_locked_learn_more"
-        style="@style/Widget.AppCompat.Button.Borderless.Colored"
+        style="@style/Button.Borderless"
         android:layout_width="0dp"
         android:layout_height="wrap_content"
         android:layout_marginStart="32dp"
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 3855fea1aa..21e4412ebc 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -242,7 +242,7 @@
     </style>
 
     <style name="Button.Borderless" parent="Base.Widget.AppCompat.Button.Borderless">
-        <item name="android:textColor">@color/core_ultramarine</item>
+        <item name="android:textColor">?attr/colorAccent</item>
     </style>
 
     <!-- RedPhone -->
diff --git a/app/src/main/res/values/themes.xml b/app/src/main/res/values/themes.xml
index c480575a1d..6e2c3f03d8 100644
--- a/app/src/main/res/values/themes.xml
+++ b/app/src/main/res/values/themes.xml
@@ -461,7 +461,7 @@
         <item name="search_view_style_dark">@style/Signal.SearchView.Dark</item>
 
         <item name="invite_edit_text_background">@drawable/invite_edit_text_background_dark</item>
-        <item name="invite_share_icon">@drawable/ic_share_solid_24</item>
+        <item name="invite_share_icon">@drawable/ic_share_solid_24_dark</item>
 
         <item name="title_text_color_primary">@color/core_grey_05</item>
         <item name="title_text_color_secondary">@color/core_grey_25</item>