diff --git a/src/main/res/layout/activity_change_password.xml b/src/main/res/layout/activity_change_password.xml
index 628d227cfe7fb927e3036f08aa35eb58a5e382c7..b0e3462bf82c6c996c3bcf1d290a8f5dc6bfedfa 100644
--- a/src/main/res/layout/activity_change_password.xml
+++ b/src/main/res/layout/activity_change_password.xml
@@ -81,7 +81,7 @@
 
         <Button
             android:id="@+id/left_button"
-            style="?android:attr/borderlessButtonStyle"
+            style="@style/Widget.Conversations.Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -96,7 +96,7 @@
 
         <Button
             android:id="@+id/right_button"
-            style="?android:attr/borderlessButtonStyle"
+            style="@style/Widget.Conversations.Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
diff --git a/src/main/res/layout/activity_contact_details.xml b/src/main/res/layout/activity_contact_details.xml
index 9d20cff905627220d2aaea7d8e05900607bb01bc..c08f5fdb2241e3dbc6c1b173d1519785151d8a6d 100644
--- a/src/main/res/layout/activity_contact_details.xml
+++ b/src/main/res/layout/activity_contact_details.xml
@@ -149,7 +149,7 @@
 
                             <Button
                                 android:id="@+id/scan_button"
-                                style="?android:attr/borderlessButtonStyle"
+                                style="@style/Widget.Conversations.Button.Borderless"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:minWidth="0dp"
@@ -160,7 +160,7 @@
 
                             <Button
                                 android:id="@+id/show_inactive_devices"
-                                style="?android:attr/borderlessButtonStyle"
+                                style="@style/Widget.Conversations.Button.Borderless"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:minWidth="0dp"
diff --git a/src/main/res/layout/activity_edit_account.xml b/src/main/res/layout/activity_edit_account.xml
index f826a949e43a8b2d08757f01109e6e95989c193d..ee00134b28cb848f1b52013400c6a1451c5d949d 100644
--- a/src/main/res/layout/activity_edit_account.xml
+++ b/src/main/res/layout/activity_edit_account.xml
@@ -203,7 +203,7 @@
 
                             <Button
                                 android:id="@+id/os_optimization_disable"
-                                style="?android:attr/borderlessButtonStyle"
+                                style="@style/Widget.Conversations.Button.Borderless"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:minWidth="0dp"
@@ -603,7 +603,7 @@
 
                         <Button
                             android:id="@+id/clear_devices"
-                            style="?android:attr/borderlessButtonStyle"
+                            style="@style/Widget.Conversations.Button.Borderless"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:layout_gravity="center_horizontal"
@@ -626,7 +626,7 @@
 
             <Button
                 android:id="@+id/cancel_button"
-                style="?android:attr/borderlessButtonStyle"
+                style="@style/Widget.Conversations.Button.Borderless"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -641,7 +641,7 @@
 
             <Button
                 android:id="@+id/save_button"
-                style="?android:attr/borderlessButtonStyle"
+                style="@style/Widget.Conversations.Button.Borderless"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
diff --git a/src/main/res/layout/activity_muc_details.xml b/src/main/res/layout/activity_muc_details.xml
index 7b0ddf52106af36a4a92da6f51dd50680f7f4e60..70f4bb742323db3cc1439777492fb3b88d7910ac 100644
--- a/src/main/res/layout/activity_muc_details.xml
+++ b/src/main/res/layout/activity_muc_details.xml
@@ -223,7 +223,7 @@
 
                             <Button
                                 android:id="@+id/invite"
-                                style="?android:attr/borderlessButtonStyle"
+                                style="@style/Widget.Conversations.Button.Borderless"
                                 android:layout_width="wrap_content"
                                 android:layout_height="wrap_content"
                                 android:minWidth="0dp"
diff --git a/src/main/res/layout/activity_publish_profile_picture.xml b/src/main/res/layout/activity_publish_profile_picture.xml
index 4ec0264d3a8011b12d753e77553bb34aaa9c1422..64f871b7d034ae74839556828c24f2590c41a02c 100644
--- a/src/main/res/layout/activity_publish_profile_picture.xml
+++ b/src/main/res/layout/activity_publish_profile_picture.xml
@@ -71,7 +71,7 @@
 
         <Button
             android:id="@+id/cancel_button"
-            style="?android:attr/borderlessButtonStyle"
+            style="@style/Widget.Conversations.Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
@@ -86,7 +86,7 @@
 
         <Button
             android:id="@+id/publish_button"
-            style="?android:attr/borderlessButtonStyle"
+            style="@style/Widget.Conversations.Button.Borderless"
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:layout_weight="1"
diff --git a/src/main/res/layout/activity_share_location.xml b/src/main/res/layout/activity_share_location.xml
index fba3c9bbf3c87f38da8b502a4616822f97ef4fe3..e5234890b1731cc4fa9010591bfee7ab504f1990 100644
--- a/src/main/res/layout/activity_share_location.xml
+++ b/src/main/res/layout/activity_share_location.xml
@@ -16,7 +16,7 @@
                 android:id="@+id/snackbar_coordinator"
                 android:layout_width="match_parent"
                 android:layout_height="match_parent"
-               android:layout_above="@+id/button_bar" >
+                android:layout_above="@+id/button_bar" >
 
                 <android.support.design.widget.FloatingActionButton
                     android:id="@+id/fab"
diff --git a/src/main/res/layout/activity_trust_keys.xml b/src/main/res/layout/activity_trust_keys.xml
index e585092f199e2b378d0de6eed13bc11f4164e45f..dbc6323e0a0eea95fcf31d39448dd76289c1e373 100644
--- a/src/main/res/layout/activity_trust_keys.xml
+++ b/src/main/res/layout/activity_trust_keys.xml
@@ -75,7 +75,7 @@
 
                         <Button
                             android:id="@+id/disable_button"
-                            style="?android:attr/borderlessButtonStyle"
+                            style="@style/Widget.Conversations.Button.Borderless"
                             android:layout_width="wrap_content"
                             android:layout_height="wrap_content"
                             android:minWidth="0dp"
@@ -144,7 +144,7 @@
 
             <Button
                 android:id="@+id/cancel_button"
-                style="?android:attr/borderlessButtonStyle"
+                style="@style/Widget.Conversations.Button.Borderless"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
@@ -159,7 +159,7 @@
 
             <Button
                 android:id="@+id/save_button"
-                style="?android:attr/borderlessButtonStyle"
+                style="@style/Widget.Conversations.Button.Borderless"
                 android:layout_width="0dp"
                 android:layout_height="wrap_content"
                 android:layout_weight="1"
diff --git a/src/main/res/layout/magic_create.xml b/src/main/res/layout/magic_create.xml
index 8687f668eb47bf87de0188866154b584351c1e70..174fdd64779586ade8c34ca46b80b83ec40c7487 100644
--- a/src/main/res/layout/magic_create.xml
+++ b/src/main/res/layout/magic_create.xml
@@ -60,7 +60,7 @@
                     android:visibility="invisible"/>
                 <Button
                     android:id="@+id/create_account"
-                    style="?android:attr/borderlessButtonStyle"
+                    style="@style/Widget.Conversations.Button.Borderless"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="right"
diff --git a/src/main/res/layout/message_status.xml b/src/main/res/layout/message_status.xml
index ad95d6ad53b5b94ec01cac6f2759dd30a8e503cd..9fb193fea940cefec16cf5b848c7d578736afe3d 100644
--- a/src/main/res/layout/message_status.xml
+++ b/src/main/res/layout/message_status.xml
@@ -11,12 +11,13 @@
 
     <Button
         android:id="@+id/load_more_messages"
-        style="?android:attr/borderlessButtonStyle"
+        style="@style/Widget.Conversations.Button.Borderless"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
+        android:layout_centerHorizontal="true"
+        android:layout_centerVertical="true"
         android:text="@string/load_more_messages"
-        android:textColor="@color/accent" android:layout_centerVertical="true"
-        android:layout_centerHorizontal="true"/>
+        android:textColor="@color/accent"/>
 
     <com.makeramen.roundedimageview.RoundedImageView
         android:id="@+id/message_photo"
@@ -33,12 +34,12 @@
         android:id="@+id/status_message"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:minHeight="32dp"
         android:layout_centerVertical="true"
-        android:gravity="center_vertical"
         android:layout_marginLeft="8dp"
         android:layout_toEndOf="@+id/message_photo"
         android:layout_toRightOf="@+id/message_photo"
+        android:gravity="center_vertical"
+        android:minHeight="32dp"
         android:text="@string/contact_has_read_up_to_this_point"
         android:textAppearance="@style/TextAppearance.Conversations.Status"/>
 
diff --git a/src/main/res/layout/welcome.xml b/src/main/res/layout/welcome.xml
index e65abbeefd91901cf4bacdabd38c28da12a04de2..1de97a1c02c95bf9218feece2d59ee3b1a208d03 100644
--- a/src/main/res/layout/welcome.xml
+++ b/src/main/res/layout/welcome.xml
@@ -44,7 +44,7 @@
                     android:textAppearance="@style/TextAppearance.Conversations.Body1"/>
                 <Button
                     android:id="@+id/create_account"
-                    style="?android:attr/borderlessButtonStyle"
+                    style="@style/Widget.Conversations.Button.Borderless"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="right"
@@ -52,7 +52,7 @@
                     android:textColor="@color/accent"/>
                 <Button
                     android:id="@+id/use_own_provider"
-                    style="?android:attr/borderlessButtonStyle"
+                    style="@style/Widget.Conversations.Button.Borderless"
                     android:layout_width="wrap_content"
                     android:layout_height="wrap_content"
                     android:layout_gravity="right"