diff --git a/config/sql/users.sql b/config/sql/users.sql
index fc4adef5..0142ab40 100644
--- a/config/sql/users.sql
+++ b/config/sql/users.sql
@@ -6,9 +6,8 @@ CREATE TABLE public.users
 (
     id text COLLATE pg_catalog."default" NOT NULL,
     updated timestamp with time zone,
-    notifications integer,
+    notifications text[] COLLATE pg_catalog."default",
     subscriptions text[] COLLATE pg_catalog."default",
-    notifications_viewed timestamp with time zone,
     email text COLLATE pg_catalog."default" NOT NULL,
     CONSTRAINT users_email_key UNIQUE (email),
     CONSTRAINT users_id_key UNIQUE (id)
diff --git a/src/helpers.cr b/src/helpers.cr
index 9bfa8b19..bca3954e 100644
--- a/src/helpers.cr
+++ b/src/helpers.cr
@@ -81,12 +81,11 @@ end
 
 class User
   add_mapping({
-    id:                   String,
-    updated:              Time,
-    notifications:        Int32,
-    subscriptions:        Array(String),
-    notifications_viewed: Time,
-    email:                String,
+    id:            String,
+    updated:       Time,
+    notifications: Array(String),
+    subscriptions: Array(String),
+    email:         String,
   })
 end
 
@@ -547,6 +546,11 @@ def fetch_channel(id, client, db)
     video_array = video.to_a
     args = arg_array(video_array)
 
+    db.exec("UPDATE users SET notifications = notifications || $1 \
+    WHERE updated < $2 AND $3 = ANY(subscriptions) AND $1 <> ALL(notifications)", video_id, published, ucid)
+
+    # UPDATE users SET notifications = notifications || ARRAY['Os9Rypn2rEQ'] WHERE updated < '2018-03-24 20:48:46' AND 'UCSc16oMxxlcJSb9SXkjwMjA' = ANY(subscriptions) AND 'Os9Rypn2rEQ' <> ALL (notifications);
+
     # TODO: Update record on conflict
     db.exec("INSERT INTO channel_videos VALUES (#{args})\
       ON CONFLICT (id) DO NOTHING", video_array)
@@ -569,7 +573,7 @@ def get_user(sid, client, headers, db)
       args = arg_array(user_array)
 
       db.exec("INSERT INTO users VALUES (#{args}) \
-      ON CONFLICT (email) DO UPDATE SET id = $1, updated = $2, subscriptions = $4", user_array)
+      ON CONFLICT (email) DO UPDATE SET id = $1, updated = $2, notifications = ARRAY[]::text[], subscriptions = $4", user_array)
     end
   else
     user = fetch_user(sid, client, headers)
@@ -603,6 +607,6 @@ def fetch_user(sid, client, headers)
     email = ""
   end
 
-  user = User.new(sid, Time.now, 0, channels, Time.now, email)
+  user = User.new(sid, Time.now, [] of String, channels, email)
   return user
 end
diff --git a/src/invidious.cr b/src/invidious.cr
index f4d7f791..0250070b 100644
--- a/src/invidious.cr
+++ b/src/invidious.cr
@@ -186,6 +186,13 @@ end
 before_all do |env|
   if env.request.cookies.has_key?("SID")
     env.set "authorized", true
+
+    sid = env.request.cookies["SID"].value
+    env.set "sid", sid
+
+    notifications = PG_DB.query_one?("SELECT cardinality(notifications) FROM users WHERE id = $1", sid, as: Int32)
+    notifications ||= 0
+    env.set "notifications", notifications
   else
     env.set "authorized", false
   end
@@ -213,7 +220,7 @@ get "/watch" do |env|
 
   authorized = env.get? "authorized"
   if authorized
-    sid = env.request.cookies["SID"].value
+    sid = env.get("sid").as(String)
 
     subscriptions = PG_DB.query_one("SELECT subscriptions FROM users WHERE id = $1", sid, as: Array(String))
   else
@@ -580,7 +587,7 @@ get "/feed/subscriptions" do |env|
     headers = HTTP::Headers.new
     headers["Cookie"] = env.request.headers["Cookie"]
 
-    sid = env.request.cookies["SID"].value
+    sid = env.get("sid").as(String)
 
     client = get_client(youtube_pool)
     user = get_user(sid, client, headers, PG_DB)
@@ -589,7 +596,9 @@ get "/feed/subscriptions" do |env|
     args = arg_array(user.subscriptions)
     offset = (page - 1) * max_results
     videos = PG_DB.query_all("SELECT * FROM channel_videos WHERE ucid IN (#{args})\
-      ORDER BY published DESC LIMIT #{max_results} OFFSET #{offset}", user.subscriptions, as: ChannelVideo)
+    ORDER BY published DESC LIMIT #{max_results} OFFSET #{offset}", user.subscriptions, as: ChannelVideo)
+
+    env.set "notifications", 0
 
     templated "subscriptions"
   else
@@ -723,7 +732,7 @@ get "/subscription_ajax" do |env|
 
     # Update user
     if client.post(post_url, headers, post_req).status_code == 200
-      sid = env.request.cookies["SID"].value
+      sid = env.get("sid").as(String)
 
       case action
       when .starts_with? "action_create"
diff --git a/src/views/layout.ecr b/src/views/layout.ecr
index 2077d0f3..1c068350 100644
--- a/src/views/layout.ecr
+++ b/src/views/layout.ecr
@@ -29,7 +29,11 @@
         <div class="pure-g">
           <div class="pure-u-1 pure-u-md-1-3">
             <a href="/feed/subscriptions" class="pure-menu-heading">
+              <% if env.get("notifications").as(Int32) > 0 %>
+              <center><i class="fas fa-bell"></i></center>
+              <% else %>
               <center><i class="far fa-bell"></i></center>
+              <% end %>
             </a>
           </div>
           <div class="pure-u-1 pure-u-md-2-3">