diff --git a/res/layout-sw400dp/fragment_enter_chat_url.xml b/res/layout-sw400dp/fragment_enter_chat_url.xml
index f1a0feb4a0..7e81c7dd7b 100644
--- a/res/layout-sw400dp/fragment_enter_chat_url.xml
+++ b/res/layout-sw400dp/fragment_enter_chat_url.xml
@@ -7,6 +7,12 @@
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?android:dividerHorizontal"
+        android:elevation="1dp" />
+
     <EditText
         style="@style/SessionEditText"
         android:id="@+id/chatURLEditText"
diff --git a/res/layout-sw400dp/fragment_enter_public_key.xml b/res/layout-sw400dp/fragment_enter_public_key.xml
index 4c4bca1c3b..9acdc7e6db 100644
--- a/res/layout-sw400dp/fragment_enter_public_key.xml
+++ b/res/layout-sw400dp/fragment_enter_public_key.xml
@@ -8,6 +8,12 @@
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?android:dividerHorizontal"
+        android:elevation="1dp" />
+
     <EditText
         style="@style/SessionEditText"
         android:id="@+id/publicKeyEditText"
diff --git a/res/layout/activity_create_closed_group.xml b/res/layout/activity_create_closed_group.xml
index 6778a17915..a965ae8551 100644
--- a/res/layout/activity_create_closed_group.xml
+++ b/res/layout/activity_create_closed_group.xml
@@ -73,7 +73,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_centerInParent="true"
-            app:SpinKit_Color="?android:colorControlNormal" />
+            app:SpinKit_Color="@android:color/white" />
 
     </RelativeLayout>
 
diff --git a/res/layout/activity_home.xml b/res/layout/activity_home.xml
index 53e3a9138d..3e582f439f 100644
--- a/res/layout/activity_home.xml
+++ b/res/layout/activity_home.xml
@@ -14,7 +14,6 @@
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
         android:background="?colorPrimary"
-        android:elevation="1dp"
         app:contentInsetStart="0dp">
 
         <LinearLayout
@@ -65,6 +64,12 @@
 
             </RelativeLayout>
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="?android:dividerHorizontal"
+                android:elevation="1dp" />
+
             <org.thoughtcrime.securesms.loki.views.SeedReminderView
                 android:id="@+id/seedReminderView"
                 android:layout_width="match_parent"
diff --git a/res/layout/activity_join_public_chat.xml b/res/layout/activity_join_public_chat.xml
index 8ad81ba3de..d437a230fc 100644
--- a/res/layout/activity_join_public_chat.xml
+++ b/res/layout/activity_join_public_chat.xml
@@ -32,7 +32,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_centerInParent="true"
-            app:SpinKit_Color="@color/text" />
+            app:SpinKit_Color="@android:color/white" />
 
     </RelativeLayout>
 
diff --git a/res/layout/activity_settings.xml b/res/layout/activity_settings.xml
index b1e5f4df2b..38a27f7168 100644
--- a/res/layout/activity_settings.xml
+++ b/res/layout/activity_settings.xml
@@ -248,7 +248,7 @@
             android:layout_height="wrap_content"
             android:layout_marginTop="8dp"
             android:layout_centerInParent="true"
-            app:SpinKit_Color="@color/text" />
+            app:SpinKit_Color="@android:color/white" />
 
     </RelativeLayout>
 
diff --git a/res/layout/conversation_activity.xml b/res/layout/conversation_activity.xml
index eb4c4891a9..de99e57802 100644
--- a/res/layout/conversation_activity.xml
+++ b/res/layout/conversation_activity.xml
@@ -108,6 +108,12 @@
                 android:indeterminate="false"
                 android:progress="0" />
 
+            <View
+                android:layout_width="match_parent"
+                android:layout_height="1px"
+                android:background="?android:dividerHorizontal"
+                android:elevation="1dp" />
+
             <org.thoughtcrime.securesms.loki.views.SessionRestoreBannerView
                 android:id="@+id/sessionRestoreBannerView"
                 android:layout_width="match_parent"
diff --git a/res/layout/fragment_enter_chat_url.xml b/res/layout/fragment_enter_chat_url.xml
index a477981590..4a1cc2a505 100644
--- a/res/layout/fragment_enter_chat_url.xml
+++ b/res/layout/fragment_enter_chat_url.xml
@@ -7,6 +7,12 @@
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?android:dividerHorizontal"
+        android:elevation="1dp" />
+
     <EditText
         style="@style/SmallSessionEditText"
         android:id="@+id/chatURLEditText"
diff --git a/res/layout/fragment_enter_public_key.xml b/res/layout/fragment_enter_public_key.xml
index 92e27cf260..ffd53dd34e 100644
--- a/res/layout/fragment_enter_public_key.xml
+++ b/res/layout/fragment_enter_public_key.xml
@@ -7,6 +7,12 @@
     android:gravity="center_horizontal"
     android:orientation="vertical">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?android:dividerHorizontal"
+        android:elevation="1dp" />
+
     <EditText
         style="@style/SmallSessionEditText"
         android:id="@+id/publicKeyEditText"
diff --git a/res/layout/fragment_view_my_qr_code.xml b/res/layout/fragment_view_my_qr_code.xml
index 95379f3885..a1f276511a 100644
--- a/res/layout/fragment_view_my_qr_code.xml
+++ b/res/layout/fragment_view_my_qr_code.xml
@@ -4,6 +4,12 @@
     android:layout_width="match_parent"
     android:layout_height="match_parent">
 
+    <View
+        android:layout_width="match_parent"
+        android:layout_height="1px"
+        android:background="?android:dividerHorizontal"
+        android:elevation="1dp" />
+
     <ScrollView
         android:layout_width="match_parent"
         android:layout_height="wrap_content"