diff --git a/templates/user/notification/notification_div.tmpl b/templates/user/notification/notification_div.tmpl
index c8db659c1..9a4fbe786 100644
--- a/templates/user/notification/notification_div.tmpl
+++ b/templates/user/notification/notification_div.tmpl
@@ -35,26 +35,26 @@
 							{{$issue := .Issue}}
 							{{$repo := .Repository}}
 							<tr id="notification_{{.ID}}">
-								<td class="collapsing" data-href="{{.Link}}">
+								<td class="collapsing gt-pl-4" data-href="{{.Link}}">
 									{{if eq .Status 3}}
-										<span class="blue">{{svg "octicon-pin"}}</span>
+										{{svg "octicon-pin" 16 "text blue"}}
 									{{else if not $issue}}
-										<span class="gray">{{svg "octicon-repo"}}</span>
+										{{svg "octicon-repo" 16 "text grey"}}
 									{{else if $issue.IsPull}}
 										{{if $issue.IsClosed}}
 											{{if $issue.GetPullRequest.HasMerged}}
-												<span class="purple">{{svg "octicon-git-merge"}}</span>
+												{{svg "octicon-git-merge" 16 "text purple"}}
 											{{else}}
-												<span class="red">{{svg "octicon-git-pull-request"}}</span>
+												{{svg "octicon-git-pull-request" 16 "text red"}}
 											{{end}}
 										{{else}}
-											<span class="green">{{svg "octicon-git-pull-request"}}</span>
+											{{svg "octicon-git-pull-request" 16 "text green"}}
 										{{end}}
 									{{else}}
 										{{if $issue.IsClosed}}
-											<span class="red">{{svg "octicon-issue-closed"}}</span>
+											{{svg "octicon-issue-closed" 16 "text red"}}
 										{{else}}
-											<span class="green">{{svg "octicon-issue-opened"}}</span>
+											{{svg "octicon-issue-opened" 16 "text green"}}
 										{{end}}
 									{{end}}
 								</td>
diff --git a/web_src/css/user.css b/web_src/css/user.css
index a3379440d..8722181c2 100644
--- a/web_src/css/user.css
+++ b/web_src/css/user.css
@@ -90,27 +90,6 @@
   padding: 8px 15px;
 }
 
-.user.notification .svg {
-  float: left;
-  font-size: 2em;
-}
-
-.user.notification .svg.green {
-  color: var(--color-green);
-}
-
-.user.notification .svg.red {
-  color: var(--color-red);
-}
-
-.user.notification .svg.purple {
-  color: var(--color-purple);
-}
-
-.user.notification .svg.blue {
-  color: var(--color-blue);
-}
-
 .user.notification .content {
   float: left;
   margin-left: 7px;
@@ -175,4 +154,13 @@
 
 #notification_div .tab.segment {
   overflow-x: auto;
+  padding: 0;
+}
+
+#notification_div .menu .active.item {
+  background: var(--color-box-body);
+}
+
+#notification_table {
+  border: none;
 }