diff --git a/include/channel.php b/include/channel.php
index fef933ba7..488bdeef0 100644
--- a/include/channel.php
+++ b/include/channel.php
@@ -1373,7 +1373,6 @@ function profile_sidebar($profile, $block = 0, $show_connect = true, $zcard = fa
 		? trim(substr($profile['channel_name'],0,strpos($profile['channel_name'],' '))) : $profile['channel_name']);
 	$lastname = (($firstname === $profile['channel_name']) ? '' : trim(substr($profile['channel_name'],strlen($firstname))));
 
-	// @fixme move this to the diaspora plugin itself
 
 	$contact_block = contact_block();
 
diff --git a/include/nav.php b/include/nav.php
index eccb89764..b51a03c4f 100644
--- a/include/nav.php
+++ b/include/nav.php
@@ -280,6 +280,8 @@ EOT;
 		'$help' => t('@name, #tag, ?doc, content'),
 		'$pleasewait' => t('Please wait...'),
 		'$nav_apps' => $nav_apps,
+		'$channel_menu' => get_config('system','channel_menu'),
+		'$channel_thumb' => ((App::$profile) ? App::$profile['thumb'] : ''),
 		'$channel_apps' => $channel_apps,
 		'$addapps' => t('Add Apps'),
 		'$orderapps' => t('Arrange Apps'),
@@ -481,7 +483,8 @@ function channel_apps($is_owner = false, $nickname = null) {
 		[
 			'$tabs'  => $arr['tabs'],
 			'$name'  => App::$profile['channel_name'],
-			'$thumb' => App::$profile['thumb']
+			'$thumb' => App::$profile['thumb'],
+			'$channel_menu' => get_config('system','channel_menu')
 		]
 	);
 }
diff --git a/view/tpl/nav.tpl b/view/tpl/nav.tpl
index 82cdc0dd0..9f4525c17 100755
--- a/view/tpl/nav.tpl
+++ b/view/tpl/nav.tpl
@@ -218,10 +218,20 @@
 			<a class="nav-link {{$nav.help.2}}" target="hubzilla-help" href="{{$nav.help.0}}" title="{{$nav.help.3}}" id="{{$nav.help.4}}" onclick="contextualHelp(); return false;"><i class="fa fa-fw fa-question-circle"></i></a>
 		</li>
 		{{/if}}
+		{{if $channel_menu && $channel_apps.0}}
+		<li class="nav-item dropdown" id="channel-menu">
+			<a class="nav-link" href="#" data-toggle="dropdown"><img src="{{$channel_thumb}}" style="height:14px; width:14px;position:relative; top:-2px;" /></a>
+			<div id="dropdown-menu" class="dropdown-menu dropdown-menu-right">
+				{{foreach $channel_apps as $channel_app}}
+				{{$channel_app}}
+				{{/foreach}}
+			</div>
+		</li>
+		{{/if}}
 		<li class="nav-item dropdown" id="app-menu">
 			<a class="nav-link" href="#" data-toggle="dropdown"><i class="fa fa-fw fa-bars"></i></a>
 			<div id="dropdown-menu" class="dropdown-menu dropdown-menu-right">
-				{{if $channel_apps.0}}
+				{{if $channel_apps.0 && ! $channel_menu}}
 				{{foreach $channel_apps as $channel_app}}
 				{{$channel_app}}
 				{{/foreach}}
@@ -233,7 +243,7 @@
 				{{foreach $nav_apps as $nav_app}}
 				{{$nav_app}}
 				{{/foreach}}
-				{{if $channel_apps.0}}
+				{{if $channel_apps.0 && ! $channel_menu}}
 				</div>
 				{{/if}}
 				{{if $is_owner}}
diff --git a/view/tpl/profile_tabs.tpl b/view/tpl/profile_tabs.tpl
index 49b74bb8f..b59135209 100644
--- a/view/tpl/profile_tabs.tpl
+++ b/view/tpl/profile_tabs.tpl
@@ -1,5 +1,7 @@
-<div class="dropdown-header"><img src="{{$thumb}}" class="menu-img-1">{{$name}}:</div>
+<div class="dropdown-header"><img src="{{$thumb}}" class="menu-img-1">{{$name}}</div>
 {{foreach $tabs as $tab}}
 <a class="dropdown-item{{if $tab.sel}} {{$tab.sel}}{{/if}}" href="{{$tab.url}}"{{if $tab.title}} title="{{$tab.title}}"{{/if}}><i class="fa fa-fw fa-{{$tab.icon}} generic-icons-nav"></i>{{$tab.label}}</a>
 {{/foreach}}
+{{if ! $channel_menu}}
 <div class="dropdown-divider"></div>
+{{/if}}
\ No newline at end of file