diff --git a/view/theme/quattro/dark/style.css b/view/theme/quattro/dark/style.css
index 1d951aba84..16c786d201 100644
--- a/view/theme/quattro/dark/style.css
+++ b/view/theme/quattro/dark/style.css
@@ -48,6 +48,9 @@
 .icon.s10.unlock {
   background-image: url("../../../images/icons/10/unlock.png");
 }
+.icon.s10.plugin {
+  background-image: url("../../../images/icons/10/plugin.png");
+}
 .icon.s10.type-unkn {
   background-image: url("../../../images/icons/10/zip.png");
 }
@@ -100,6 +103,9 @@
 .icon.s16.unlock {
   background-image: url("../../../images/icons/16/unlock.png");
 }
+.icon.s16.plugin {
+  background-image: url("../../../images/icons/16/plugin.png");
+}
 .icon.s16.type-unkn {
   background-image: url("../../../images/icons/16/zip.png");
 }
@@ -152,6 +158,9 @@
 .icon.s22.unlock {
   background-image: url("../../../images/icons/22/unlock.png");
 }
+.icon.s22.plugin {
+  background-image: url("../../../images/icons/22/plugin.png");
+}
 .icon.s22.type-unkn {
   background-image: url("../../../images/icons/22/zip.png");
 }
@@ -204,6 +213,9 @@
 .icon.s48.unlock {
   background-image: url("../../../images/icons/48/unlock.png");
 }
+.icon.s48.plugin {
+  background-image: url("../../../images/icons/48/plugin.png");
+}
 .icon.s48.type-unkn {
   background-image: url("../../../images/icons/48/zip.png");
 }
@@ -501,6 +513,17 @@ ul.menu-popup .empty {
   text-align: center;
   color: #9eabb0;
 }
+ul.menu-popup .toolbar {
+  background-color: #9eabb0;
+  height: auto;
+  overflow: auto;
+}
+ul.menu-popup .toolbar a {
+  float: right;
+}
+ul.menu-popup .toolbar a:hover {
+  background-color: #ffffff;
+}
 /* autocomplete popup */
 .acpopup {
   max-height: 150px;
diff --git a/view/theme/quattro/green/style.css b/view/theme/quattro/green/style.css
index e7cc549d07..df43aa152f 100644
--- a/view/theme/quattro/green/style.css
+++ b/view/theme/quattro/green/style.css
@@ -48,6 +48,9 @@
 .icon.s10.unlock {
   background-image: url("../../../images/icons/10/unlock.png");
 }
+.icon.s10.plugin {
+  background-image: url("../../../images/icons/10/plugin.png");
+}
 .icon.s10.type-unkn {
   background-image: url("../../../images/icons/10/zip.png");
 }
@@ -100,6 +103,9 @@
 .icon.s16.unlock {
   background-image: url("../../../images/icons/16/unlock.png");
 }
+.icon.s16.plugin {
+  background-image: url("../../../images/icons/16/plugin.png");
+}
 .icon.s16.type-unkn {
   background-image: url("../../../images/icons/16/zip.png");
 }
@@ -152,6 +158,9 @@
 .icon.s22.unlock {
   background-image: url("../../../images/icons/22/unlock.png");
 }
+.icon.s22.plugin {
+  background-image: url("../../../images/icons/22/plugin.png");
+}
 .icon.s22.type-unkn {
   background-image: url("../../../images/icons/22/zip.png");
 }
@@ -204,6 +213,9 @@
 .icon.s48.unlock {
   background-image: url("../../../images/icons/48/unlock.png");
 }
+.icon.s48.plugin {
+  background-image: url("../../../images/icons/48/plugin.png");
+}
 .icon.s48.type-unkn {
   background-image: url("../../../images/icons/48/zip.png");
 }
@@ -501,6 +513,17 @@ ul.menu-popup .empty {
   text-align: center;
   color: #9eabb0;
 }
+ul.menu-popup .toolbar {
+  background-color: #9eabb0;
+  height: auto;
+  overflow: auto;
+}
+ul.menu-popup .toolbar a {
+  float: right;
+}
+ul.menu-popup .toolbar a:hover {
+  background-color: #ffffff;
+}
 /* autocomplete popup */
 .acpopup {
   max-height: 150px;
diff --git a/view/theme/quattro/icons.less b/view/theme/quattro/icons.less
index e314fba1fd..3688ae0213 100644
--- a/view/theme/quattro/icons.less
+++ b/view/theme/quattro/icons.less
@@ -13,6 +13,7 @@
 	&.link		{ background-image: url("../../../images/icons/@{size}/link.png"); }
 	&.lock		{ background-image: url("../../../images/icons/@{size}/lock.png"); }
 	&.unlock	{ background-image: url("../../../images/icons/@{size}/unlock.png"); }
+	&.plugin	{ background-image: url("../../../images/icons/@{size}/plugin.png"); }
 	&.type-unkn	{ background-image: url("../../../images/icons/@{size}/zip.png"); }
 	&.type-audio{ background-image: url("../../../images/icons/@{size}/audio.png"); }
 	&.type-video{ background-image: url("../../../images/icons/@{size}/video.png"); }
diff --git a/view/theme/quattro/nav.tpl b/view/theme/quattro/nav.tpl
index 8c872864c2..26f04f134c 100644
--- a/view/theme/quattro/nav.tpl
+++ b/view/theme/quattro/nav.tpl
@@ -43,8 +43,7 @@
 			<li  id="nav-notifications-linkmenu" class="nav-menu-icon"><a href="$nav.notifications.0" rel="#nav-notifications-menu" title="$nav.notifications.1"><span class="icon s22 notify">$nav.notifications.1</span></a>
 				<span id="notify-update" class="nav-notify"></span>
 				<ul id="nav-notifications-menu" class="menu-popup">
-					<li id="nav-notifications-mark-all"><a href="#" onclick="notifyMarkAll(); return false;">$nav.notifications.mark.1</a></li>
-					<li id="nav-notifications-see-all"><a href="$nav.notifications.all.0">$nav.notifications.all.1</a></li>
+					<li id="nav-notifications-mark-all" class="toolbar"><a href="#" onclick="notifyMarkAll(); return false;" title="$nav.notifications.mark.1"><span class="icon s10 edit"></span></a></a><a href="$nav.notifications.all.0" title="$nav.notifications.all.1"><span class="icon s10 plugin"></span></a></li>
 					<li class="empty">$emptynotifications</li>
 				</ul>
 			</li>		
@@ -92,40 +91,3 @@
 	<li><a href="{0}"><img src="{1}">{2} <span class="notif-when">{3}</span></a></li>
 </ul>
 
-{#
-
-{{ if $nav.logout }}<a id="nav-logout-link" class="nav-link $nav.logout.2" href="$nav.logout.0" title="$nav.logout.3" >$nav.logout.1</a> {{ endif }}
-{{ if $nav.login }}<a id="nav-login-link" class="nav-login-link $nav.login.2" href="$nav.login.0" title="$nav.login.3" >$nav.login.1</a> {{ endif }}
-
-<span id="nav-link-wrapper" >
-
-{{ if $nav.register }}<a id="nav-register-link" class="nav-commlink $nav.register.2" href="$nav.register.0" title="$nav.register.3" >$nav.register.1</a>{{ endif }}
-	
-<a id="nav-help-link" class="nav-link $nav.help.2" target="friendika-help" href="$nav.help.0" title="$nav.help.3" >$nav.help.1</a>
-	
-{{ if $nav.apps }}<a id="nav-apps-link" class="nav-link $nav.apps.2" href="$nav.apps.0" title="$nav.apps.3" >$nav.apps.1</a>{{ endif }}
-
-<a id="nav-search-link" class="nav-link $nav.search.2" href="$nav.search.0" title="$nav.search.3" >$nav.search.1</a>
-<a id="nav-directory-link" class="nav-link $nav.directory.2" href="$nav.directory.0" title="$nav.directory.3" >$nav.directory.1</a>
-
-{{ if $nav.admin }}<a id="nav-admin-link" class="nav-link $nav.admin.2" href="$nav.admin.0" title="$nav.admin.3" >$nav.admin.1</a>{{ endif }}
-
-{{ if $nav.notifications }}
-<a id="nav-notify-link" class="nav-commlink $nav.notifications.2" href="$nav.notifications.0" title="$nav.notifications.3" >$nav.notifications.1</a>
-<span id="notify-update" class="nav-ajax-left"></span>
-{{ endif }}
-{{ if $nav.messages }}
-<a id="nav-messages-link" class="nav-commlink $nav.messages.2" href="$nav.messages.0" title="$nav.messages.3" >$nav.messages.1</a>
-<span id="mail-update" class="nav-ajax-left"></span>
-{{ endif }}
-
-{{ if $nav.manage }}<a id="nav-manage-link" class="nav-commlink $nav.manage.2" href="$nav.manage.0" title="$nav.manage.3">$nav.manage.1</a>{{ endif }}
-
-{{ if $nav.settings }}<a id="nav-settings-link" class="nav-link $nav.settings.2" href="$nav.settings.0" title="$nav.settings.3">$nav.settings.1</a>{{ endif }}
-{{ if $nav.profiles }}<a id="nav-profiles-link" class="nav-link $nav.profiles.2" href="$nav.profiles.0" title="$nav.profiles.3" >$nav.profiles.1</a>{{ endif }}
-
-
-</span>
-<span id="nav-end"></span>
-<span id="banner">$banner</span>
-#}
diff --git a/view/theme/quattro/quattro.less b/view/theme/quattro/quattro.less
index c6352cfe99..0660a3ad76 100644
--- a/view/theme/quattro/quattro.less
+++ b/view/theme/quattro/quattro.less
@@ -227,6 +227,12 @@ ul.menu-popup {
 			text-align: center;
 			color: @MenuEmpty;
 		}
+		.toolbar {
+			background-color:  @MenuEmpty; 
+			height: auto; overflow: auto;
+			a { float: right; }
+			a:hover { background-color: @MenuBg; }
+		}
 		
 }