diff --git a/res/drawable-notnight/prominent_filled_button_medium_background.xml b/res/drawable-notnight/prominent_filled_button_medium_background.xml
new file mode 100644
index 0000000000..6f6bd22a51
--- /dev/null
+++ b/res/drawable-notnight/prominent_filled_button_medium_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid  android:color="?android:colorControlNormal" />
+
+    <corners android:radius="@dimen/medium_button_corner_radius" />
+
+    <stroke android:width="@dimen/border_thickness" android:color="?android:colorControlNormal" />
+</shape>
\ No newline at end of file
diff --git a/res/drawable-notnight/unimportant_filled_button_medium_background.xml b/res/drawable-notnight/unimportant_filled_button_medium_background.xml
new file mode 100644
index 0000000000..f6ea907be5
--- /dev/null
+++ b/res/drawable-notnight/unimportant_filled_button_medium_background.xml
@@ -0,0 +1,11 @@
+<?xml version="1.0" encoding="utf-8"?>
+<shape
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    android:shape="rectangle">
+
+    <solid android:color="@color/unimportant_button_background" />
+
+    <corners android:radius="@dimen/medium_button_corner_radius" />
+
+    <stroke android:width="@dimen/border_thickness" android:color="?android:textColorPrimary" />
+</shape>
\ No newline at end of file
diff --git a/res/layout-sw400dp/fragment_enter_chat_url.xml b/res/layout-sw400dp/fragment_enter_chat_url.xml
index f1a0feb4a0..564580c481 100644
--- a/res/layout-sw400dp/fragment_enter_chat_url.xml
+++ b/res/layout-sw400dp/fragment_enter_chat_url.xml
@@ -23,7 +23,7 @@
         android:layout_weight="1" />
 
     <Button
-        style="@style/Widget.Session.Button.Common.ProminentOutline"
+        style="@style/Widget.Session.Button.Common.ProminentFilled"
         android:id="@+id/joinPublicChatButton"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/layout-sw400dp/fragment_enter_public_key.xml b/res/layout-sw400dp/fragment_enter_public_key.xml
index a278272f1b..ae996d2411 100644
--- a/res/layout-sw400dp/fragment_enter_public_key.xml
+++ b/res/layout-sw400dp/fragment_enter_public_key.xml
@@ -1,6 +1,7 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout
     xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools"
     android:id="@+id/contentView"
     android:layout_width="match_parent"
     android:layout_height="match_parent"
@@ -54,7 +55,7 @@
         android:textColor="@color/text"
         android:fontFamily="@font/space_mono_regular"
         android:textAlignment="center"
-        android:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
+        tools:text="05987d601943c267879be41830888066c6a024cbdc9a548d06813924bf3372ea78" />
 
     <LinearLayout
         android:layout_width="match_parent"
@@ -89,7 +90,7 @@
         android:layout_weight="1" />
 
     <Button
-        style="@style/Widget.Session.Button.Common.ProminentOutline"
+        style="@style/Widget.Session.Button.Common.ProminentFilled"
         android:id="@+id/createPrivateChatButton"
         android:layout_width="196dp"
         android:layout_height="@dimen/medium_button_height"
diff --git a/res/values-notnight-v21/colors.xml b/res/values-notnight-v21/colors.xml
index bead4b079e..b9ab4d5c39 100644
--- a/res/values-notnight-v21/colors.xml
+++ b/res/values-notnight-v21/colors.xml
@@ -11,7 +11,7 @@
     <color name="cell_selected">#DFDFDF</color>
     <color name="navigation_bar_background">#FCFCFC</color>
     <color name="separator">#B0B0B0</color>
-    <color name="unimportant_button_background">#E8E8E8</color>
+    <color name="unimportant_button_background">@android:color/transparent</color>
     <color name="unimportant_dialog_button_background">@color/unimportant_button_background</color>
     <color name="dialog_background">#FCFCFC</color>
     <color name="dialog_border">#212121</color>
diff --git a/res/values-notnight-v21/styles.xml b/res/values-notnight-v21/styles.xml
index 5bed1e1889..6bcd395e17 100644
--- a/res/values-notnight-v21/styles.xml
+++ b/res/values-notnight-v21/styles.xml
@@ -6,4 +6,9 @@
         <item name="android:textColor">?android:textColorPrimary</item>
     </style>
 
+    <style name="Widget.Session.Button.Common.ProminentFilled">
+        <item name="android:background">@drawable/prominent_filled_button_medium_background</item>
+        <item name="android:textColor">@android:color/white</item>
+    </style>
+
 </resources>
\ No newline at end of file