diff --git a/res/layout-sw400dp/fragment_enter_chat_url.xml b/res/layout-sw400dp/fragment_enter_chat_url.xml
index 7e81c7dd7b..a1bf13aedc 100644
--- a/res/layout-sw400dp/fragment_enter_chat_url.xml
+++ b/res/layout-sw400dp/fragment_enter_chat_url.xml
@@ -21,6 +21,7 @@
         android:layout_marginLeft="@dimen/large_spacing"
         android:layout_marginTop="@dimen/large_spacing"
         android:layout_marginRight="@dimen/large_spacing"
+        android:inputType="textWebEmailAddress"
         android:hint="Enter an open group URL" />
 
     <View
diff --git a/res/layout/fragment_enter_chat_url.xml b/res/layout/fragment_enter_chat_url.xml
index 4a1cc2a505..b778d99b38 100644
--- a/res/layout/fragment_enter_chat_url.xml
+++ b/res/layout/fragment_enter_chat_url.xml
@@ -21,6 +21,7 @@
         android:layout_marginLeft="@dimen/large_spacing"
         android:layout_marginTop="@dimen/large_spacing"
         android:layout_marginRight="@dimen/large_spacing"
+        android:inputType="textWebEmailAddress"
         android:hint="@string/fragment_enter_chat_url_edit_text_hint" />
 
     <View
diff --git a/res/values-notnight-v21/styles.xml b/res/values-notnight-v21/styles.xml
index 2cb9066705..9873bbffb0 100644
--- a/res/values-notnight-v21/styles.xml
+++ b/res/values-notnight-v21/styles.xml
@@ -21,4 +21,9 @@
         <item name="android:elevation">4dp</item>
     </style>
 
+    <style name="Widget.Session.Button.Dialog.Destructive">
+        <item name="android:background">@android:color/transparent</item>
+        <item name="android:textColor">@color/destructive</item>
+    </style>
+
 </resources>
\ No newline at end of file
diff --git a/res/values-notnight-v21/themes.xml b/res/values-notnight-v21/themes.xml
index 3743b4fc5a..f1c362efda 100644
--- a/res/values-notnight-v21/themes.xml
+++ b/res/values-notnight-v21/themes.xml
@@ -31,7 +31,6 @@
 
     </style>
 
-
     <!-- Session light theme (these values overlays their dark theme counterparts from Theme.TextSecure) -->
     <style name="Theme.TextSecure.DayNight" parent="Base.Theme.TextSecure">