diff --git a/Habitica/res/layout/activity_notifications.xml b/Habitica/res/layout/activity_notifications.xml
index 7cca95d2b..1f3f7e3bc 100644
--- a/Habitica/res/layout/activity_notifications.xml
+++ b/Habitica/res/layout/activity_notifications.xml
@@ -38,16 +38,15 @@
 
             <androidx.core.widget.NestedScrollView
                 android:layout_width="match_parent"
-                android:layout_height="match_parent"
-                android:paddingBottom="?attr/actionBarSize">
+                android:layout_height="match_parent">
 
-                <com.habitrpg.android.habitica.ui.views.PaddedLinearLayout
+                <LinearLayout
                     android:id="@+id/notification_items"
                     android:layout_width="match_parent"
                     android:layout_height="wrap_content"
                     android:divider="?android:listDivider"
                     android:orientation="vertical"
-                    android:showDividers="middle"></com.habitrpg.android.habitica.ui.views.PaddedLinearLayout>
+                    android:showDividers="middle" />
             </androidx.core.widget.NestedScrollView>
         </androidx.swiperefreshlayout.widget.SwipeRefreshLayout>
     </FrameLayout>
diff --git a/Habitica/res/layout/notification_item.xml b/Habitica/res/layout/notification_item.xml
index 2f2b51049..26a6827df 100644
--- a/Habitica/res/layout/notification_item.xml
+++ b/Habitica/res/layout/notification_item.xml
@@ -3,6 +3,7 @@
     android:id="@+id/notification_item"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@color/white"
     android:orientation="horizontal"
     android:paddingLeft="20dp"
     android:paddingTop="10dp"
diff --git a/Habitica/res/layout/notifications_header.xml b/Habitica/res/layout/notifications_header.xml
index bcdc9c3d9..e060a4296 100644
--- a/Habitica/res/layout/notifications_header.xml
+++ b/Habitica/res/layout/notifications_header.xml
@@ -3,9 +3,10 @@
     xmlns:tools="http://schemas.android.com/tools"
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
+    android:background="@color/white"
     android:orientation="horizontal"
     android:paddingLeft="20dp"
-    android:paddingTop="14dp"
+    android:paddingTop="10dp"
     android:paddingRight="20dp">
 
     <LinearLayout
diff --git a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
index 27c4e6dc7..a19f88e39 100644
--- a/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
+++ b/Habitica/src/main/java/com/habitrpg/android/habitica/ui/activities/NotificationsActivity.kt
@@ -8,6 +8,7 @@ import android.view.LayoutInflater
 import android.view.View
 import android.widget.Button
 import android.widget.ImageView
+import android.widget.LinearLayout
 import android.widget.TextView
 import androidx.core.content.ContextCompat
 import androidx.lifecycle.ViewModelProviders
@@ -79,18 +80,22 @@ class NotificationsActivity : BaseActivity(), androidx.swiperefreshlayout.widget
         notification_items.removeAllViewsInLayout()
 
         when {
-            notifications.isEmpty() -> displayNoNotificationsVew()
+            notifications.isEmpty() -> displayNoNotificationsView()
             else -> displayNotificationsListView(notifications)
         }
     }
 
-    private fun displayNoNotificationsVew() {
+    private fun displayNoNotificationsView() {
+        notification_items.showDividers = LinearLayout.SHOW_DIVIDER_NONE
+
         notification_items.addView(
                 inflater.inflate(R.layout.no_notifications, notification_items, false)
         )
     }
 
     private fun displayNotificationsListView(notifications: List<Notification>) {
+        notification_items.showDividers = LinearLayout.SHOW_DIVIDER_MIDDLE or LinearLayout.SHOW_DIVIDER_END
+
         notification_items.addView(
                 createNotificationsHeaderView(notifications.count())
         )