diff --git a/src/main/res/layout/enter_jid_dialog.xml b/src/main/res/layout/enter_jid_dialog.xml
index 6333e340a823c7630a6dc1f6cbbbfb56fa46dcac..1e715ce460397a45d165dd8975958bab78586203 100644
--- a/src/main/res/layout/enter_jid_dialog.xml
+++ b/src/main/res/layout/enter_jid_dialog.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="8dp" >
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:paddingBottom="8dp"
+              android:paddingLeft="24dp"
+              android:paddingRight="24dp"
+              android:paddingTop="16dp">
 
     <TextView
         android:id="@+id/your_account"
@@ -11,21 +14,21 @@
         android:layout_height="wrap_content"
         android:text="@string/your_account"
         android:textColor="@color/black87"
-        android:textSize="?attr/TextSizeBody" />
+        android:textSize="?attr/TextSizeBody"/>
 
     <Spinner
         android:id="@+id/account"
         android:layout_width="fill_parent"
-        android:layout_height="wrap_content" />
+        android:layout_height="wrap_content"/>
 
     <TextView
         android:id="@+id/jabber_id"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="16dp"
         android:text="@string/account_settings_jabber_id"
         android:textColor="@color/black87"
-        android:textSize="?attr/TextSizeBody" />
+        android:textSize="?attr/TextSizeBody"/>
 
     <AutoCompleteTextView
         android:id="@+id/jid"
@@ -34,6 +37,6 @@
         android:hint="@string/account_settings_example_jabber_id"
         android:inputType="textEmailAddress"
         android:textColor="@color/black87"
-        android:textColorHint="@color/black54" />
+        android:textColorHint="@color/black54"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/src/main/res/layout/join_conference_dialog.xml b/src/main/res/layout/join_conference_dialog.xml
index 7609dd0d53c407e3af6274592490885097129676..4be88872b79d8d3625cc6ba57aa6d70a97f0c006 100644
--- a/src/main/res/layout/join_conference_dialog.xml
+++ b/src/main/res/layout/join_conference_dialog.xml
@@ -1,9 +1,12 @@
 <?xml version="1.0" encoding="utf-8"?>
 <LinearLayout xmlns:android="http://schemas.android.com/apk/res/android"
-    android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:orientation="vertical"
-    android:padding="8dp" >
+              android:layout_width="match_parent"
+              android:layout_height="match_parent"
+              android:orientation="vertical"
+              android:paddingBottom="8dp"
+              android:paddingLeft="24dp"
+              android:paddingRight="24dp"
+              android:paddingTop="16dp">
 
     <TextView
         android:id="@+id/your_account"
@@ -22,7 +25,7 @@
         android:id="@+id/jabber_id"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="16dp"
         android:text="@string/conference_address"
         android:textColor="@color/black87"
         android:textSize="?attr/TextSizeBody" />
@@ -40,7 +43,7 @@
         android:id="@+id/bookmark"
         android:layout_width="wrap_content"
         android:layout_height="wrap_content"
-        android:layout_marginTop="8dp"
+        android:layout_marginTop="16dp"
         android:checked="true"
         android:text="@string/save_as_bookmark" />