diff --git a/app/src/main/java/com/fastaccess/ui/adapter/NotificationsAdapter.java b/app/src/main/java/com/fastaccess/ui/adapter/NotificationsAdapter.java
index 375e9951..270ff5b4 100644
--- a/app/src/main/java/com/fastaccess/ui/adapter/NotificationsAdapter.java
+++ b/app/src/main/java/com/fastaccess/ui/adapter/NotificationsAdapter.java
@@ -2,6 +2,7 @@ package com.fastaccess.ui.adapter;
 
 import android.support.annotation.NonNull;
 import android.support.v7.widget.StaggeredGridLayoutManager;
+import android.view.View;
 import android.view.ViewGroup;
 
 import com.fastaccess.R;
@@ -47,8 +48,7 @@ public class NotificationsAdapter extends BaseRecyclerAdapter<GroupedNotificatio
             ((NotificationsHeaderViewHolder) holder).bind(getItem(position));
             if(hideClear)
                 if(getItem(Math.min(position+1, getItemCount()-1)).getNotification().isUnread())
-                    ((FontTextView)((NotificationsHeaderViewHolder) holder).itemView).
-                            setCompoundDrawablesWithIntrinsicBounds(0, 0, R.drawable.ic_clear_all, 0);
+                    (((NotificationsHeaderViewHolder) holder).itemView).findViewById(R.id.markAsRead).setVisibility(View.VISIBLE);
         } else {
             ((NotificationsViewHolder) holder).bind(getItem(position));
         }
diff --git a/app/src/main/java/com/fastaccess/ui/modules/notification/all/AllNotificationsPresenter.java b/app/src/main/java/com/fastaccess/ui/modules/notification/all/AllNotificationsPresenter.java
index 363f430a..5632dd0d 100644
--- a/app/src/main/java/com/fastaccess/ui/modules/notification/all/AllNotificationsPresenter.java
+++ b/app/src/main/java/com/fastaccess/ui/modules/notification/all/AllNotificationsPresenter.java
@@ -49,9 +49,13 @@ public class AllNotificationsPresenter extends BasePresenter<AllNotificationsMvp
                 }
             }
         } else {
-            Repo repo = model.getRepo();
-            if (repo == null) return;
-            getView().onMarkAllByRepo(repo);
+            if (v.getId() == R.id.markAsRead) {
+                Repo repo = model.getRepo();
+                if (repo == null) return;
+                getView().onMarkAllByRepo(repo);
+            } else {
+
+            }
         }
     }
 
diff --git a/app/src/main/res/layouts/other_layouts/layout/empty_layout.xml b/app/src/main/res/layouts/other_layouts/layout/empty_layout.xml
index 18594ad5..34cdd456 100644
--- a/app/src/main/res/layouts/other_layouts/layout/empty_layout.xml
+++ b/app/src/main/res/layouts/other_layouts/layout/empty_layout.xml
@@ -35,10 +35,5 @@
             android:textAppearance="@style/TextAppearance.AppCompat.Title"
             android:textColor="@color/carrot"/>
 
-        <ProgressBar
-            android:id="@+id/progressBar"
-            android:layout_width="wrap_content"
-            android:layout_height="wrap_content"/>
-
     </LinearLayout>
 </merge>
\ No newline at end of file
diff --git a/app/src/main/res/layouts/row_layouts/layout/notification_header_row_item.xml b/app/src/main/res/layouts/row_layouts/layout/notification_header_row_item.xml
index f5332e45..3352e84b 100644
--- a/app/src/main/res/layouts/row_layouts/layout/notification_header_row_item.xml
+++ b/app/src/main/res/layouts/row_layouts/layout/notification_header_row_item.xml
@@ -1,12 +1,28 @@
 <?xml version="1.0" encoding="utf-8"?>
-<com.fastaccess.ui.widgets.FontTextView
-    android:id="@+id/headerTitle"
-    style="@style/TextAppearance.AppCompat.Title"
-    xmlns:android="http://schemas.android.com/apk/res/android"
-    xmlns:tools="http://schemas.android.com/tools"
+<RelativeLayout
     android:layout_width="match_parent"
     android:layout_height="wrap_content"
     android:background="?selectableItemBackground"
+    android:gravity="center_horizontal"
     android:padding="@dimen/spacing_xs_large"
-    android:textColor="?colorAccent"
-    tools:text="k0shk0sh/FastHub"/>
\ No newline at end of file
+    xmlns:android="http://schemas.android.com/apk/res/android"
+    xmlns:tools="http://schemas.android.com/tools">
+    <com.fastaccess.ui.widgets.FontTextView
+        android:layout_width="match_parent"
+        android:layout_height="wrap_content"
+        android:id="@+id/headerTitle"
+        android:textColor="?colorAccent"
+        tools:text="k0shk0sh/FastHub"
+        style="@style/TextAppearance.AppCompat.Title"/>
+
+    <ImageButton
+        android:id="@+id/markAsRead"
+        android:layout_width="wrap_content"
+        android:layout_height="wrap_content"
+        android:visibility="gone"
+        android:layout_alignParentEnd="true"
+        android:src="@drawable/ic_clear_all"
+        android:background="?selectableItemBackgroundBorderless"
+        android:contentDescription="@string/mark_all_as_read"/>
+
+</RelativeLayout>
\ No newline at end of file