diff --git a/app/src/main/res/drawable-night/shadow.xml b/app/src/main/res/drawable-night/shadow.xml
index 1ad36d1..bb66332 100644
--- a/app/src/main/res/drawable-night/shadow.xml
+++ b/app/src/main/res/drawable-night/shadow.xml
@@ -3,7 +3,7 @@
 
     <item>
         <shape android:shape="rectangle">
-            <solid android:color="#1c1e21" />
+            <solid android:color="@color/nb_gray_separator" />
             <corners
                 android:topLeftRadius="25dp"
                 android:topRightRadius="25dp"
diff --git a/app/src/main/res/layout/fragment_home.xml b/app/src/main/res/layout/fragment_home.xml
index 96eb035..3f633e6 100644
--- a/app/src/main/res/layout/fragment_home.xml
+++ b/app/src/main/res/layout/fragment_home.xml
@@ -7,6 +7,33 @@
     android:background="@color/nb_bg_home"
     tools:context=".ui.home.HomeFragment">
 
+    <Space
+        android:id="@+id/spacer"
+        android:layout_width="0dp"
+        android:layout_height="wrap_content"
+        app:layout_constraintTop_toTopOf="@id/top_guideline"
+        app:layout_constraintBottom_toTopOf="@id/barrier_below_bg_mask_container"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintVertical_bias="0.412" />
+
+    <View
+        android:id="@+id/mask_background"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:background="@color/nb_bg_mask"
+        app:layout_constraintTop_toTopOf="@id/spacer"
+        app:layout_constraintStart_toStartOf="parent"
+        app:layout_constraintEnd_toEndOf="parent"
+        app:layout_constraintWidth_percent="0.79" />
+
+    <androidx.constraintlayout.widget.Barrier
+        android:id="@+id/barrier_below_bg_mask_container"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        app:barrierDirection="bottom"
+        app:constraint_referenced_ids="bg_mask_container"/>
+
     <androidx.constraintlayout.widget.ConstraintLayout
         android:id="@+id/bg_mask_container"
         android:layout_width="wrap_content"
@@ -58,17 +85,6 @@
 
     </androidx.constraintlayout.widget.ConstraintLayout>
 
-
-    <View
-        android:id="@+id/white_background"
-        android:layout_width="0dp"
-        android:layout_height="0dp"
-        android:background="@color/nb_bg_mask"
-        app:layout_constraintTop_toBottomOf="@id/bg_mask_container"
-        app:layout_constraintBottom_toBottomOf="parent"
-        app:layout_constraintStart_toStartOf="@id/bg_mask_container"
-        app:layout_constraintEnd_toEndOf="@id/bg_mask_container"/>
-
     <TextView
         android:id="@+id/text_hostname"
         android:layout_width="wrap_content"
@@ -101,6 +117,9 @@
             android:layout_width="0dp"
             android:layout_height="wrap_content"
             android:background="@drawable/shadow"
+            android:orientation="vertical"
+            android:gravity="center"
+            app:layout_constraintWidth_max="600dp"
             app:layout_constraintBottom_toBottomOf="parent"
             app:layout_constraintEnd_toEndOf="parent"
             app:layout_constraintStart_toStartOf="parent">
@@ -129,7 +148,7 @@
                 android:textSize="16sp" />
         </LinearLayout>
 
-        </FrameLayout>>
+    </FrameLayout>
 
     <androidx.constraintlayout.widget.Guideline
         android:id="@+id/top_guideline"
diff --git a/app/src/main/res/layout/layout_zero_peer.xml b/app/src/main/res/layout/layout_zero_peer.xml
index 6542fb9..dec2209 100644
--- a/app/src/main/res/layout/layout_zero_peer.xml
+++ b/app/src/main/res/layout/layout_zero_peer.xml
@@ -5,7 +5,7 @@
     android:layout_height="wrap_content"
     android:orientation="vertical"
     android:padding="40dp"
-    android:background="@color/nb_bg">
+    android:background="@color/nb_bg_peers">
 
     <ImageView
         android:layout_width="wrap_content"
diff --git a/app/src/main/res/values-night/colors.xml b/app/src/main/res/values-night/colors.xml
index 536224d..87a9a84 100644
--- a/app/src/main/res/values-night/colors.xml
+++ b/app/src/main/res/values-night/colors.xml
@@ -9,6 +9,7 @@
     <color name="white">#FFFFFF</color>
 
     <color name="nb_bg">#181A1D</color>
+    <color name="nb_bg_peers">#181A1D</color>
     <color name="nb_bg_home">#1c1e21</color>
     <color name="nb_bg_mask">#181A1D</color>
     <color name="nb_gray_light">#32363D</color>
diff --git a/app/src/main/res/values/colors.xml b/app/src/main/res/values/colors.xml
index adc2c58..8fad634 100644
--- a/app/src/main/res/values/colors.xml
+++ b/app/src/main/res/values/colors.xml
@@ -9,6 +9,7 @@
     <color name="white">#FFFFFFFF</color>
 
     <color name="nb_bg">#F2F2F2</color>
+    <color name="nb_bg_peers">#F5F5F5</color>
     <color name="nb_bg_home">#DEDEDE</color>
     <color name="nb_bg_mask">#F2F2F2</color>
     <color name="nb_gray_light">#F5F5F5</color>