diff --git a/res/layout-sw400dp/activity_pn_mode.xml b/res/layout-sw400dp/activity_pn_mode.xml
index 8edc9267df..e2e5433453 100644
--- a/res/layout-sw400dp/activity_pn_mode.xml
+++ b/res/layout-sw400dp/activity_pn_mode.xml
@@ -1,116 +1,114 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
-    android:orientation="vertical">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:textSize="@dimen/very_large_font_size"
-        android:textStyle="bold"
-        android:textColor="@color/text"
-        android:text="@string/activity_pn_mode_title" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="10dp"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:textSize="@dimen/medium_font_size"
-        android:textColor="@color/text"
-        android:text="@string/activity_pn_mode_explanation" />
+    android:layout_height="match_parent">
 
     <LinearLayout
-        android:id="@+id/fcmOptionView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="@dimen/medium_spacing"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:padding="12dp"
-        android:orientation="vertical"
-        android:background="@drawable/pn_option_background">
+        android:background="@drawable/default_session_background"
+        android:orientation="vertical">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/very_large_spacing"
+            android:layout_marginTop="@dimen/very_large_spacing"
+            android:layout_marginRight="@dimen/very_large_spacing"
+            android:textSize="@dimen/very_large_font_size"
+            android:textStyle="bold"
+            android:textColor="@color/text"
+            android:text="@string/activity_pn_mode_title" />
+
+        <TextView
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/very_large_spacing"
+            android:layout_marginTop="@dimen/medium_spacing"
+            android:layout_marginRight="@dimen/very_large_spacing"
             android:textSize="@dimen/medium_font_size"
             android:textColor="@color/text"
-            android:textStyle="bold"
-            android:text="@string/activity_pn_mode_fcm_option_title" />
+            android:text="@string/activity_pn_mode_explanation" />
 
-        <TextView
+        <LinearLayout
+            android:id="@+id/fcmOptionView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textSize="@dimen/very_small_font_size"
-            android:textColor="@color/text"
-            android:text="@string/activity_pn_mode_fcm_option_explanation" />
+            android:layout_marginLeft="@dimen/very_large_spacing"
+            android:layout_marginTop="20dp"
+            android:layout_marginRight="@dimen/very_large_spacing"
+            android:padding="12dp"
+            android:orientation="vertical"
+            android:background="@drawable/pn_option_background">
 
-        <TextView
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/medium_font_size"
+                android:textColor="@color/text"
+                android:textStyle="bold"
+                android:text="@string/activity_pn_mode_fcm_option_title" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textSize="@dimen/very_small_font_size"
+                android:textColor="@color/text"
+                android:text="@string/activity_pn_mode_fcm_option_explanation" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textSize="@dimen/very_small_font_size"
+                android:textColor="@color/accent"
+                android:textStyle="bold"
+                android:text="@string/activity_pn_mode_recommended_option_tag" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/backgroundPollingOptionView"
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textSize="@dimen/very_small_font_size"
-            android:textColor="@color/accent"
-            android:textStyle="bold"
-            android:text="@string/activity_pn_mode_recommended_option_tag" />
+            android:layout_marginLeft="@dimen/very_large_spacing"
+            android:layout_marginTop="@dimen/small_spacing"
+            android:layout_marginRight="@dimen/very_large_spacing"
+            android:padding="12dp"
+            android:orientation="vertical"
+            android:background="@drawable/pn_option_background">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/medium_font_size"
+                android:textColor="@color/text"
+                android:textStyle="bold"
+                android:text="@string/activity_pn_mode_background_polling_option_title" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textSize="@dimen/very_small_font_size"
+                android:textColor="@color/text"
+                android:text="@string/activity_pn_mode_background_polling_option_explanation" />
+
+        </LinearLayout>
+
+        <Button
+            style="@style/MediumProminentFilledButton"
+            android:id="@+id/registerButton"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/medium_button_height"
+            android:layout_marginLeft="@dimen/massive_spacing"
+            android:layout_marginTop="@dimen/medium_spacing"
+            android:layout_marginRight="@dimen/massive_spacing"
+            android:layout_marginBottom="@dimen/medium_spacing"
+            android:text="@string/continue_2" />
 
     </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/backgroundPollingOptionView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="@dimen/small_spacing"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:padding="12dp"
-        android:orientation="vertical"
-        android:background="@drawable/pn_option_background">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="@dimen/medium_font_size"
-            android:textColor="@color/text"
-            android:textStyle="bold"
-            android:text="@string/activity_pn_mode_background_polling_option_title" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textSize="@dimen/very_small_font_size"
-            android:textColor="@color/text"
-            android:text="@string/activity_pn_mode_background_polling_option_explanation" />
-
-    </LinearLayout>
-    
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
-
-    <Button
-        style="@style/MediumProminentFilledButton"
-        android:id="@+id/registerButton"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/medium_button_height"
-        android:layout_marginLeft="@dimen/massive_spacing"
-        android:layout_marginRight="@dimen/massive_spacing"
-        android:layout_marginBottom="@dimen/medium_spacing"
-        android:text="Continue" />
-
-</LinearLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file
diff --git a/res/layout/activity_pn_mode.xml b/res/layout/activity_pn_mode.xml
index d06cdd8f4a..f8b2b75145 100644
--- a/res/layout/activity_pn_mode.xml
+++ b/res/layout/activity_pn_mode.xml
@@ -1,116 +1,114 @@
 <?xml version="1.0" encoding="utf-8"?>
-<LinearLayout
+<ScrollView
     xmlns:android="http://schemas.android.com/apk/res/android"
     android:layout_width="match_parent"
-    android:layout_height="match_parent"
-    android:background="@drawable/default_session_background"
-    android:orientation="vertical">
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:textSize="18sp"
-        android:textStyle="bold"
-        android:textColor="@color/text"
-        android:text="@string/activity_pn_mode_title" />
-
-    <TextView
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="4dp"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:textSize="13sp"
-        android:textColor="@color/text"
-        android:text="@string/activity_pn_mode_explanation" />
+    android:layout_height="wrap_content">
 
     <LinearLayout
-        android:id="@+id/fcmOptionView"
         android:layout_width="match_parent"
         android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="4dp"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:padding="10dp"
-        android:orientation="vertical"
-        android:background="@drawable/pn_option_background">
+        android:background="@drawable/default_session_background"
+        android:orientation="vertical">
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:textSize="14sp"
-            android:textColor="@color/text"
+            android:layout_marginLeft="@dimen/very_large_spacing"
+            android:layout_marginTop="@dimen/very_large_spacing"
+            android:layout_marginRight="@dimen/very_large_spacing"
+            android:textSize="@dimen/large_font_size"
             android:textStyle="bold"
-            android:text="@string/activity_pn_mode_fcm_option_title" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textSize="@dimen/very_small_font_size"
             android:textColor="@color/text"
-            android:text="@string/activity_pn_mode_fcm_option_explanation" />
+            android:text="@string/activity_pn_mode_title" />
 
         <TextView
             android:layout_width="match_parent"
             android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textSize="@dimen/very_small_font_size"
-            android:textColor="@color/accent"
-            android:textStyle="bold"
-            android:text="@string/activity_pn_mode_recommended_option_tag" />
+            android:layout_marginLeft="@dimen/very_large_spacing"
+            android:layout_marginTop="@dimen/small_spacing"
+            android:layout_marginRight="@dimen/very_large_spacing"
+            android:textSize="@dimen/small_font_size"
+            android:textColor="@color/text"
+            android:text="@string/activity_pn_mode_explanation" />
+
+        <LinearLayout
+            android:id="@+id/fcmOptionView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/very_large_spacing"
+            android:layout_marginTop="12dp"
+            android:layout_marginRight="@dimen/very_large_spacing"
+            android:padding="12dp"
+            android:orientation="vertical"
+            android:background="@drawable/pn_option_background">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/medium_spacing"
+                android:textColor="@color/text"
+                android:textStyle="bold"
+                android:text="@string/activity_pn_mode_fcm_option_title" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textSize="@dimen/very_small_font_size"
+                android:textColor="@color/text"
+                android:text="@string/activity_pn_mode_fcm_option_explanation" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textSize="@dimen/very_small_font_size"
+                android:textColor="@color/accent"
+                android:textStyle="bold"
+                android:text="@string/activity_pn_mode_recommended_option_tag" />
+
+        </LinearLayout>
+
+        <LinearLayout
+            android:id="@+id/backgroundPollingOptionView"
+            android:layout_width="match_parent"
+            android:layout_height="wrap_content"
+            android:layout_marginLeft="@dimen/very_large_spacing"
+            android:layout_marginTop="@dimen/small_spacing"
+            android:layout_marginRight="@dimen/very_large_spacing"
+            android:padding="12dp"
+            android:orientation="vertical"
+            android:background="@drawable/pn_option_background">
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:textSize="@dimen/medium_spacing"
+                android:textColor="@color/text"
+                android:textStyle="bold"
+                android:text="@string/activity_pn_mode_background_polling_option_title" />
+
+            <TextView
+                android:layout_width="match_parent"
+                android:layout_height="wrap_content"
+                android:layout_marginTop="4dp"
+                android:textSize="@dimen/very_small_font_size"
+                android:textColor="@color/text"
+                android:text="@string/activity_pn_mode_background_polling_option_explanation" />
+
+        </LinearLayout>
+
+        <Button
+            style="@style/MediumProminentFilledButton"
+            android:id="@+id/registerButton"
+            android:layout_width="match_parent"
+            android:layout_height="@dimen/medium_button_height"
+            android:layout_marginLeft="@dimen/massive_spacing"
+            android:layout_marginTop="@dimen/medium_spacing"
+            android:layout_marginRight="@dimen/massive_spacing"
+            android:layout_marginBottom="@dimen/medium_spacing"
+            android:text="@string/continue_2" />
 
     </LinearLayout>
 
-    <LinearLayout
-        android:id="@+id/backgroundPollingOptionView"
-        android:layout_width="match_parent"
-        android:layout_height="wrap_content"
-        android:layout_marginLeft="@dimen/very_large_spacing"
-        android:layout_marginTop="4dp"
-        android:layout_marginRight="@dimen/very_large_spacing"
-        android:padding="10dp"
-        android:orientation="vertical"
-        android:background="@drawable/pn_option_background">
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:textSize="14sp"
-            android:textColor="@color/text"
-            android:textStyle="bold"
-            android:text="@string/activity_pn_mode_background_polling_option_title" />
-
-        <TextView
-            android:layout_width="match_parent"
-            android:layout_height="wrap_content"
-            android:layout_marginTop="4dp"
-            android:textSize="@dimen/very_small_font_size"
-            android:textColor="@color/text"
-            android:text="@string/activity_pn_mode_background_polling_option_explanation" />
-
-    </LinearLayout>
-
-    <View
-        android:layout_width="match_parent"
-        android:layout_height="0dp"
-        android:layout_weight="1"/>
-
-    <Button
-        style="@style/MediumProminentFilledButton"
-        android:id="@+id/registerButton"
-        android:layout_width="match_parent"
-        android:layout_height="@dimen/medium_button_height"
-        android:layout_marginLeft="@dimen/massive_spacing"
-        android:layout_marginRight="@dimen/massive_spacing"
-        android:layout_marginBottom="@dimen/medium_spacing"
-        android:text="@string/continue_2" />
-
-</LinearLayout>
\ No newline at end of file
+</ScrollView>
\ No newline at end of file