Merge branch 'android-ui-tweaks'

22 files changed, 83 insertions, 67 deletions

diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInput.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInput.kt
index cfcf26fad9..f1723b2d34 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInput.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/AccountInput.kt
@@ -125,7 +125,7 @@ class AccountInput(val parentView: View, context: Context) {
         setButtonEnabled(false)
         button.visibility = View.GONE
         input.visibility = View.GONE
-        container.visibility = View.GONE
+        container.visibility = View.INVISIBLE
     }
 
     private fun failureState() {
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LocationInfo.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LocationInfo.kt
index 77e09f47d0..c46d4a3b3f 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LocationInfo.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/LocationInfo.kt
@@ -10,6 +10,9 @@ import net.mullvad.talpid.net.Endpoint
 import net.mullvad.talpid.net.TransportProtocol
 
 class LocationInfo(val parentView: View, val context: Context) {
+    private val hostnameColorCollapsed = context.getColor(R.color.white40)
+    private val hostnameColorExpanded = context.getColor(R.color.white)
+
     private val country: TextView = parentView.findViewById(R.id.country)
     private val city: TextView = parentView.findViewById(R.id.city)
     private val tunnelInfo: View = parentView.findViewById(R.id.tunnel_info)
@@ -85,11 +88,13 @@ class LocationInfo(val parentView: View, val context: Context) {
         chevron.visibility = View.VISIBLE
 
         if (isTunnelInfoExpanded) {
+            hostname.setTextColor(hostnameColorExpanded)
             chevron.rotation = 180.0F
             protocol.setText(R.string.wireguard)
             showInAddress(endpoint)
             updateOutAddress(location)
         } else {
+            hostname.setTextColor(hostnameColorCollapsed)
             chevron.rotation = 0.0F
             protocol.text = ""
             inAddress.text = ""
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AppVersionCell.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AppVersionCell.kt
index 7efe59f22b..f3508847d1 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AppVersionCell.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/AppVersionCell.kt
@@ -14,7 +14,9 @@ import net.mullvad.mullvadvpn.R
 
 class AppVersionCell : Cell {
     private val warningIcon = ImageView(context).apply {
-        layoutParams = LayoutParams(LayoutParams.WRAP_CONTENT, LayoutParams.WRAP_CONTENT, 0.0f)
+        val iconSize = resources.getDimensionPixelSize(R.dimen.app_version_warning_icon_size)
+
+        layoutParams = LayoutParams(iconSize, iconSize, 0.0f)
 
         resources.getDimensionPixelSize(R.dimen.cell_inner_spacing).let { padding ->
             setPadding(0, 0, padding, 0)
diff --git a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Cell.kt b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Cell.kt
index 6ee4f84158..cb87408251 100644
--- a/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Cell.kt
+++ b/android/src/main/kotlin/net/mullvad/mullvadvpn/ui/widget/Cell.kt
@@ -40,15 +40,15 @@ open class Cell : LinearLayout {
     protected var cell: LinearLayout = this
         set(value) {
             field = value.apply {
+                val leftPadding = resources.getDimensionPixelSize(R.dimen.cell_left_padding)
+                val rightPadding = resources.getDimensionPixelSize(R.dimen.cell_right_padding)
+
                 isClickable = true
                 gravity = Gravity.CENTER
                 orientation = HORIZONTAL
 
                 setBackgroundResource(R.drawable.cell_button_background)
-
-                resources.getDimensionPixelSize(R.dimen.cell_horizontal_padding).let { padding ->
-                    setPadding(padding, 0, padding, 0)
-                }
+                setPadding(leftPadding, 0, rightPadding, 0)
 
                 addView(label)
 
diff --git a/android/src/main/res/drawable/icon_chevron.xml b/android/src/main/res/drawable/icon_chevron.xml
index c3a56851d6..8c0fc11d10 100644
--- a/android/src/main/res/drawable/icon_chevron.xml
+++ b/android/src/main/res/drawable/icon_chevron.xml
@@ -4,7 +4,7 @@
         android:height="24dp"
         android:viewportWidth="14.0"
         android:viewportHeight="24.0">
-    <group android:translateX="5.0"
+    <group android:translateX="4.0"
            android:translateY="6.0">
         <path android:fillColor="#FFFFFF"
               android:pathData="M0.335204989,1.95371785 L4.23669259,6 L0.335204989,10.0462822 C-0.111734996,10.4932221 -0.111734996,11.217855 0.335204989,11.664795 C0.782144974,12.111735 1.49826561,12.111735 1.9452056,11.664795 L6.66818642,6.80553188 C6.88657769,6.58714061 6.99779844,6.29559541 6.99881099,6.00303766 C6.99779844,5.70440459 6.88657769,5.41285939 6.66818642,5.19446812 L1.9452056,0.335204989 C1.49826561,-0.111734996 0.782144974,-0.111734996 0.335204989,0.335204989 C-0.111734996,0.782144974 -0.111734996,1.50677786 0.335204989,1.95371785 Z" />
diff --git a/android/src/main/res/layout/account.xml b/android/src/main/res/layout/account.xml
index bf374b2ebb..d6e9819e6a 100644
--- a/android/src/main/res/layout/account.xml
+++ b/android/src/main/res/layout/account.xml
@@ -33,7 +33,7 @@
 
             <LinearLayout android:layout_width="match_parent"
                           android:layout_height="match_parent"
-                          android:layout_marginTop="4dp"
+                          android:layout_marginTop="2dp"
                           android:orientation="vertical">
                 <TextView android:id="@+id/expanded_title"
                           android:layout_width="wrap_content"
diff --git a/android/src/main/res/layout/advanced.xml b/android/src/main/res/layout/advanced.xml
index f9cb370089..ecd6a27620 100644
--- a/android/src/main/res/layout/advanced.xml
+++ b/android/src/main/res/layout/advanced.xml
@@ -38,7 +38,7 @@
                 <TextView android:id="@+id/expanded_title"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:layout_marginTop="4dp"
+                          android:layout_marginTop="2dp"
                           android:layout_marginLeft="@dimen/side_margin"
                           android:text="@string/settings_advanced"
                           style="@style/SettingsExpandedHeader" />
diff --git a/android/src/main/res/layout/connect.xml b/android/src/main/res/layout/connect.xml
index a2602dc028..a7887e5076 100644
--- a/android/src/main/res/layout/connect.xml
+++ b/android/src/main/res/layout/connect.xml
@@ -41,7 +41,7 @@
                     <TextView android:id="@+id/connection_status"
                               android:layout_width="wrap_content"
                               android:layout_height="wrap_content"
-                              android:layout_marginBottom="4dp"
+                              android:layout_marginBottom="2dp"
                               android:layout_marginHorizontal="@dimen/side_margin"
                               android:textColor="@color/red"
                               android:textSize="@dimen/text_medium"
@@ -60,6 +60,7 @@
                               android:layout_width="wrap_content"
                               android:layout_height="wrap_content"
                               android:layout_marginHorizontal="@dimen/side_margin"
+                              android:layout_marginBottom="2dp"
                               android:textColor="@color/white"
                               android:textSize="@dimen/text_huge"
                               android:textStyle="bold"
@@ -70,22 +71,22 @@
                                   android:layout_weight="0"
                                   android:orientation="vertical"
                                   android:paddingHorizontal="@dimen/side_margin"
-                                  android:gravity="start"
+                                  android:gravity="bottom"
                                   android:clickable="true"
                                   android:background="?android:attr/selectableItemBackground">
                         <LinearLayout android:layout_width="wrap_content"
                                       android:layout_height="wrap_content"
-                                      android:orientation="horizontal">
+                                      android:orientation="horizontal"
+                                      android:gravity="center">
                             <TextView android:id="@+id/hostname"
                                       android:layout_width="wrap_content"
                                       android:layout_height="wrap_content"
-                                      android:textColor="@color/white"
-                                      android:textSize="@dimen/text_medium"
-                                      android:textStyle="bold"
+                                      android:textColor="@color/white40"
+                                      android:textSize="@dimen/text_hostname"
                                       android:text="" />
                             <ImageView android:id="@+id/chevron"
-                                       android:layout_width="wrap_content"
-                                       android:layout_height="wrap_content"
+                                       android:layout_width="24dp"
+                                       android:layout_height="24dp"
                                        android:layout_marginHorizontal="5dp"
                                        android:alpha="0.4"
                                        android:src="@drawable/icon_chevron_expand" />
@@ -93,19 +94,21 @@
                         <TextView android:id="@+id/tunnel_protocol"
                                   android:layout_width="wrap_content"
                                   android:layout_height="wrap_content"
-                                  android:layout_marginTop="4dp"
+                                  android:layout_marginTop="1dp"
                                   android:textColor="@color/white"
                                   android:textSize="@dimen/text_small"
                                   android:text="" />
                         <TextView android:id="@+id/in_address"
                                   android:layout_width="wrap_content"
                                   android:layout_height="wrap_content"
+                                  android:layout_marginTop="1dp"
                                   android:textColor="@color/white"
                                   android:textSize="@dimen/text_small"
                                   android:text="" />
                         <TextView android:id="@+id/out_address"
                                   android:layout_width="wrap_content"
                                   android:layout_height="wrap_content"
+                                  android:layout_marginTop="1dp"
                                   android:textColor="@color/white"
                                   android:textSize="@dimen/text_small"
                                   android:text="" />
@@ -116,12 +119,11 @@
                               android:layout_weight="0"
                               android:orientation="vertical"
                               android:paddingHorizontal="@dimen/side_margin"
-                              android:paddingTop="@dimen/vertical_space"
+                              android:paddingTop="@dimen/button_separation"
                               android:paddingBottom="@dimen/screen_vertical_margin">
                     <Button android:id="@+id/switch_location"
-                            android:layout_marginTop="20dp"
-                            android:layout_marginBottom="16dp"
-                            android:paddingHorizontal="8dp"
+                            android:layout_marginBottom="@dimen/button_separation"
+                            android:paddingHorizontal="9dp"
                             android:text="@string/switch_location"
                             android:drawableRight="@drawable/icon_chevron"
                             style="@style/White20Button" />
@@ -133,11 +135,11 @@
                                 android:text="@string/connect"
                                 style="@style/GreenButton" />
                         <ImageButton android:id="@+id/reconnect_button"
-                                     android:layout_width="wrap_content"
+                                     android:layout_width="50dp"
                                      android:layout_height="match_parent"
                                      android:layout_weight="0"
                                      android:layout_marginLeft="1dp"
-                                     android:paddingHorizontal="10dp"
+                                     android:padding="9dp"
                                      android:background="@drawable/transparent_red_right_half_button_background"
                                      android:visibility="gone"
                                      android:src="@drawable/icon_reload" />
diff --git a/android/src/main/res/layout/header_bar.xml b/android/src/main/res/layout/header_bar.xml
index c6c0a88a38..a5965596a3 100644
--- a/android/src/main/res/layout/header_bar.xml
+++ b/android/src/main/res/layout/header_bar.xml
@@ -1,13 +1,13 @@
 <merge xmlns:android="http://schemas.android.com/apk/res/android">
-    <ImageView android:layout_width="50dp"
-               android:layout_height="50dp"
-               android:layout_marginLeft="12dp"
+    <ImageView android:layout_width="44dp"
+               android:layout_height="44dp"
+               android:layout_marginLeft="16dp"
                android:layout_marginVertical="12dp"
                android:layout_weight="0"
                android:src="@drawable/logo_icon" />
     <TextView android:layout_width="wrap_content"
               android:layout_height="wrap_content"
-              android:layout_marginHorizontal="8dp"
+              android:layout_marginHorizontal="9dp"
               android:layout_marginVertical="12dp"
               android:layout_weight="1"
               android:textColor="@color/white80"
@@ -19,7 +19,7 @@
                  android:layout_width="wrap_content"
                  android:layout_height="match_parent"
                  android:layout_weight="0"
-                 android:paddingHorizontal="12dp"
+                 android:paddingHorizontal="16dp"
                  android:background="?android:attr/selectableItemBackground"
                  android:src="@drawable/icon_settings" />
 </merge>
diff --git a/android/src/main/res/layout/launch.xml b/android/src/main/res/layout/launch.xml
index 90fee9643c..a6ae06f1ca 100644
--- a/android/src/main/res/layout/launch.xml
+++ b/android/src/main/res/layout/launch.xml
@@ -5,7 +5,7 @@
                  android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
                  android:layout_gravity="top | right"
-                 android:paddingHorizontal="12dp"
+                 android:paddingHorizontal="16dp"
                  android:paddingVertical="25dp"
                  android:background="?android:attr/selectableItemBackground"
                  android:src="@drawable/icon_settings" />
@@ -17,7 +17,7 @@
                   android:gravity="center">
         <ImageView android:layout_width="120dp"
                    android:layout_height="120dp"
-                   android:layout_marginBottom="4dp"
+                   android:layout_marginBottom="5dp"
                    android:src="@drawable/launch_logo" />
         <TextView android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
diff --git a/android/src/main/res/layout/login.xml b/android/src/main/res/layout/login.xml
index a067831296..bfa0d88e23 100644
--- a/android/src/main/res/layout/login.xml
+++ b/android/src/main/res/layout/login.xml
@@ -19,8 +19,8 @@
             <Space android:layout_width="match_parent"
                    android:layout_height="0dp"
                    android:layout_weight="1" />
-            <FrameLayout android:layout_width="60dp"
-                         android:layout_height="60dp"
+            <FrameLayout android:layout_width="48dp"
+                         android:layout_height="48dp"
                          android:layout_gravity="center_horizontal"
                          android:layout_marginBottom="30dp">
                 <ProgressBar android:id="@+id/logging_in_status"
@@ -49,7 +49,7 @@
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
                       android:layout_weight="0"
-                      android:layout_marginBottom="4dp"
+                      android:layout_marginBottom="7dp"
                       android:gravity="start"
                       android:textColor="@color/white"
                       android:textSize="@dimen/text_huge"
@@ -59,7 +59,7 @@
                       android:layout_width="match_parent"
                       android:layout_height="wrap_content"
                       android:layout_weight="0"
-                      android:layout_marginBottom="10dp"
+                      android:layout_marginBottom="8dp"
                       android:gravity="start"
                       android:textColor="@color/white80"
                       android:textSize="@dimen/text_small"
@@ -108,7 +108,7 @@
                       android:orientation="vertical"
                       android:paddingHorizontal="@dimen/side_margin"
                       android:paddingBottom="@dimen/screen_vertical_margin"
-                      android:paddingTop="16dp"
+                      android:paddingTop="@dimen/button_separation"
                       android:background="@color/darkBlue">
             <TextView android:layout_width="match_parent"
                       android:layout_height="wrap_content"
diff --git a/android/src/main/res/layout/mtu_edit_text.xml b/android/src/main/res/layout/mtu_edit_text.xml
index 1fa3e0b0e8..11334cf4c1 100644
--- a/android/src/main/res/layout/mtu_edit_text.xml
+++ b/android/src/main/res/layout/mtu_edit_text.xml
@@ -1,5 +1,6 @@
 <EditText xmlns:android="http://schemas.android.com/apk/res/android"
-          android:paddingHorizontal="4dp"
+          android:paddingHorizontal="8dp"
+          android:paddingVertical="4dp"
           android:background="@drawable/cell_input_background"
           android:digits="0123456789"
           android:inputType="number"
diff --git a/android/src/main/res/layout/notification_banner.xml b/android/src/main/res/layout/notification_banner.xml
index dd43aa0a49..abd28193d8 100644
--- a/android/src/main/res/layout/notification_banner.xml
+++ b/android/src/main/res/layout/notification_banner.xml
@@ -2,8 +2,8 @@
                 android:layout_width="match_parent"
                 android:layout_height="wrap_content"
                 android:paddingVertical="8dp"
-                android:paddingLeft="20dp"
-                android:paddingRight="10dp"
+                android:paddingLeft="16dp"
+                android:paddingRight="12dp"
                 android:background="?android:attr/selectableItemBackground">
     <RelativeLayout android:id="@+id/notification_status_container"
                     android:layout_width="wrap_content"
@@ -40,11 +40,12 @@
               android:text=""
               android:visibility="gone" />
     <ImageView android:id="@+id/notification_icon"
-               android:layout_width="12dp"
-               android:layout_height="12dp"
+               android:layout_width="20dp"
+               android:layout_height="20dp"
                android:layout_alignParentRight="true"
                android:layout_centerVertical="true"
                android:alpha="0.6"
+               android:padding="4dp"
                android:src="@drawable/icon_extlink"
                android:visibility="gone" />
 </RelativeLayout>
diff --git a/android/src/main/res/layout/out_of_time.xml b/android/src/main/res/layout/out_of_time.xml
index 544413d22c..ca1016ad61 100644
--- a/android/src/main/res/layout/out_of_time.xml
+++ b/android/src/main/res/layout/out_of_time.xml
@@ -31,7 +31,7 @@
                       android:layout_height="wrap_content"
                       android:layout_marginHorizontal="@dimen/side_margin"
                       android:layout_marginTop="8dp"
-                      android:layout_marginBottom="11dp"
+                      android:layout_marginBottom="@dimen/vertical_space"
                       android:textColor="@color/white"
                       android:textSize="@dimen/text_small" />
             <Space android:layout_width="match_parent"
diff --git a/android/src/main/res/layout/preferences.xml b/android/src/main/res/layout/preferences.xml
index 05b9702a5e..b7423cb403 100644
--- a/android/src/main/res/layout/preferences.xml
+++ b/android/src/main/res/layout/preferences.xml
@@ -38,7 +38,7 @@
                 <TextView android:id="@+id/expanded_title"
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
-                          android:layout_marginTop="4dp"
+                          android:layout_marginTop="2dp"
                           android:layout_marginLeft="@dimen/side_margin"
                           android:text="@string/settings_preferences"
                           style="@style/SettingsExpandedHeader" />
diff --git a/android/src/main/res/layout/problem_report.xml b/android/src/main/res/layout/problem_report.xml
index 8c8dba11dd..399973eef0 100644
--- a/android/src/main/res/layout/problem_report.xml
+++ b/android/src/main/res/layout/problem_report.xml
@@ -38,7 +38,7 @@
                           android:layout_width="wrap_content"
                           android:layout_height="wrap_content"
                           android:layout_weight="0"
-                          android:layout_marginTop="4dp"
+                          android:layout_marginTop="2dp"
                           android:layout_marginBottom="8dp"
                           android:layout_marginHorizontal="@dimen/side_margin"
                           android:text="@string/report_a_problem"
@@ -70,21 +70,23 @@
                                   android:layout_width="match_parent"
                                   android:layout_height="0dp"
                                   android:layout_weight="1"
-                                  android:layout_marginHorizontal="22dp"
+                                  android:layout_marginHorizontal="@dimen/side_margin"
                                   android:singleLine="false"
                                   android:hint="@string/user_message_hint"
                                   android:gravity="top"
                                   style="@style/InputText" />
                         <Button android:id="@+id/send_button"
                                 android:layout_marginHorizontal="@dimen/side_margin"
-                                android:layout_marginVertical="16dp"
+                                android:layout_marginTop="@dimen/button_separation"
+                                android:layout_marginBottom="@dimen/screen_vertical_margin"
                                 android:enabled="false"
                                 android:text="@string/send"
                                 style="@style/GreenButton" />
                     </LinearLayout>
                     <LinearLayout android:layout_width="match_parent"
                                   android:layout_height="match_parent"
-                                  android:layout_marginVertical="16dp"
+                                  android:layout_marginTop="16dp"
+                                  android:layout_marginBottom="@dimen/screen_vertical_margin"
                                   android:layout_marginHorizontal="@dimen/side_margin"
                                   android:orientation="vertical">
                         <FrameLayout android:layout_width="60dp"
@@ -146,12 +148,12 @@
                                android:layout_height="0dp"
                                android:layout_weight="1" />
                         <Button android:id="@+id/edit_message_button"
-                                android:layout_marginTop="16dp"
+                                android:layout_marginTop="@dimen/button_separation"
                                 android:text="@string/edit_message"
                                 android:visibility="gone"
                                 style="@style/BlueButton" />
                         <Button android:id="@+id/try_again_button"
-                                android:layout_marginTop="16dp"
+                                android:layout_marginTop="@dimen/button_separation"
                                 android:text="@string/try_again"
                                 android:visibility="gone"
                                 style="@style/GreenButton" />
diff --git a/android/src/main/res/layout/redeem_voucher.xml b/android/src/main/res/layout/redeem_voucher.xml
index aa0b360aa8..eedd22ac11 100644
--- a/android/src/main/res/layout/redeem_voucher.xml
+++ b/android/src/main/res/layout/redeem_voucher.xml
@@ -13,8 +13,8 @@
         <TextView android:layout_width="wrap_content"
                   android:layout_height="wrap_content"
                   android:layout_weight="0"
-                  android:layout_marginBottom="12dp"
-                  android:textColor="@color/white80"
+                  android:layout_marginBottom="9dp"
+                  android:textColor="@color/white"
                   android:textSize="@dimen/text_medium"
                   android:text="@string/enter_voucher_code" />
         <EditText android:id="@+id/voucher_code"
diff --git a/android/src/main/res/layout/relay_list_item.xml b/android/src/main/res/layout/relay_list_item.xml
index ed21e2c7d6..c8af318778 100644
--- a/android/src/main/res/layout/relay_list_item.xml
+++ b/android/src/main/res/layout/relay_list_item.xml
@@ -7,8 +7,7 @@
               android:gravity="center">
     <FrameLayout android:layout_width="wrap_content"
                  android:layout_height="wrap_content"
-                 android:layout_weight="0"
-                 android:layout_marginVertical="16dp">
+                 android:layout_weight="0">
         <ImageView android:id="@+id/relay_active"
                    android:layout_width="wrap_content"
                    android:layout_height="wrap_content"
@@ -25,7 +24,7 @@
               android:layout_height="wrap_content"
               android:layout_weight="1"
               android:layout_marginHorizontal="8dp"
-              android:layout_marginVertical="16dp"
+              android:layout_marginVertical="14dp"
               android:textColor="@color/white"
               android:textSize="@dimen/text_medium_plus"
               android:textStyle="bold"
@@ -34,7 +33,7 @@
                  android:layout_width="wrap_content"
                  android:layout_height="match_parent"
                  android:layout_weight="0"
-                 android:paddingHorizontal="@dimen/side_margin"
+                 android:paddingHorizontal="16dp"
                  android:background="?android:attr/selectableItemBackground"
                  android:src="@drawable/icon_chevron_expand" />
 </LinearLayout>
diff --git a/android/src/main/res/layout/select_location_header.xml b/android/src/main/res/layout/select_location_header.xml
index 394196ef87..88a95f4e97 100644
--- a/android/src/main/res/layout/select_location_header.xml
+++ b/android/src/main/res/layout/select_location_header.xml
@@ -16,7 +16,7 @@
               android:layout_weight="0"
               android:layout_marginHorizontal="@dimen/side_margin"
               android:layout_marginBottom="@dimen/vertical_space"
-              android:textColor="@color/white60"
+              android:textColor="@color/white80"
               android:textSize="@dimen/text_small"
               android:text="@string/select_location_description" />
     <ProgressBar android:id="@+id/loading_spinner"
diff --git a/android/src/main/res/layout/split_tunnelling_header.xml b/android/src/main/res/layout/split_tunnelling_header.xml
index 359bf1f7e8..e68dfa4f30 100644
--- a/android/src/main/res/layout/split_tunnelling_header.xml
+++ b/android/src/main/res/layout/split_tunnelling_header.xml
@@ -9,7 +9,7 @@
               android:layout_height="wrap_content"
               android:layout_weight="0"
               android:layout_marginLeft="@dimen/side_margin"
-              android:layout_marginTop="4dp"
+              android:layout_marginTop="2dp"
               android:layout_marginBottom="12dp"
               android:text="@string/split_tunnelling"
               style="@style/SettingsExpandedHeader" />
diff --git a/android/src/main/res/layout/wireguard_key.xml b/android/src/main/res/layout/wireguard_key.xml
index 389b0a1695..ca8c88a015 100644
--- a/android/src/main/res/layout/wireguard_key.xml
+++ b/android/src/main/res/layout/wireguard_key.xml
@@ -29,8 +29,8 @@
         </FrameLayout>
         <net.mullvad.mullvadvpn.ui.widget.ListenableScrollView android:id="@+id/scroll_area"
                                                                android:layout_width="match_parent"
-                                                               android:layout_height="match_parent">
-
+                                                               android:layout_height="match_parent"
+                                                               android:fillViewport="true">
             <LinearLayout android:layout_width="match_parent"
                           android:layout_height="match_parent"
                           android:orientation="vertical">
@@ -39,7 +39,7 @@
                           android:layout_height="wrap_content"
                           android:layout_weight="0"
                           android:layout_marginLeft="@dimen/side_margin"
-                          android:layout_marginTop="4dp"
+                          android:layout_marginTop="2dp"
                           android:layout_marginBottom="@dimen/half_vertical_space"
                           android:text="@string/wireguard_key"
                           style="@style/SettingsExpandedHeader" />
@@ -65,7 +65,8 @@
                 <FrameLayout android:layout_width="wrap_content"
                              android:layout_height="wrap_content"
                              android:paddingHorizontal="@dimen/side_margin"
-                             android:paddingVertical="@dimen/half_vertical_space">
+                             android:paddingTop="@dimen/half_vertical_space"
+                             android:paddingBottom="@dimen/button_separation">
                     <TextView android:id="@+id/wireguard_key_status"
                               android:layout_width="wrap_content"
                               android:layout_height="wrap_content"
diff --git a/android/src/main/res/values/dimensions.xml b/android/src/main/res/values/dimensions.xml
index 4dcb214407..f02292476c 100644
--- a/android/src/main/res/values/dimensions.xml
+++ b/android/src/main/res/values/dimensions.xml
@@ -1,7 +1,7 @@
 <resources>
-    <dimen name="country_row_padding">20dp</dimen>
-    <dimen name="city_row_padding">40dp</dimen>
-    <dimen name="relay_row_padding">60dp</dimen>
+    <dimen name="country_row_padding">18dp</dimen>
+    <dimen name="city_row_padding">34dp</dimen>
+    <dimen name="relay_row_padding">50dp</dimen>
     <dimen name="list_item_divider">1dp</dimen>
     <dimen name="dialog_margin">14dp</dimen>
     <dimen name="account_input_corner_radius">4dp</dimen>
@@ -15,16 +15,19 @@
     <dimen name="cell_switch_knob_max_translation">18dp</dimen>
     <dimen name="cell_switch_knob_size">22dp</dimen>
     <dimen name="settings_back_button_padding">12dp</dimen>
-    <dimen name="cell_horizontal_padding">@dimen/side_margin</dimen>
+    <dimen name="cell_left_padding">@dimen/side_margin</dimen>
+    <dimen name="cell_right_padding">16dp</dimen>
     <dimen name="cell_inner_spacing">8dp</dimen>
-    <dimen name="cell_label_vertical_padding">17dp</dimen>
+    <dimen name="cell_label_vertical_padding">14dp</dimen>
     <dimen name="cell_input_width">80dp</dimen>
     <dimen name="cell_input_height">34dp</dimen>
-    <dimen name="cell_footer_top_padding">8dp</dimen>
+    <dimen name="cell_footer_top_padding">6dp</dimen>
     <dimen name="cell_footer_horizontal_padding">@dimen/side_margin</dimen>
+    <dimen name="app_version_warning_icon_size">28dp</dimen>
     <dimen name="chevron_width">14dp</dimen>
     <dimen name="chevron_height">24dp</dimen>
     <dimen name="text_small">13sp</dimen>
+    <dimen name="text_hostname">15sp</dimen>
     <dimen name="text_medium">16sp</dimen>
     <dimen name="text_medium_plus">18sp</dimen>
     <dimen name="text_big">24sp</dimen>