diff --git a/mod/manage.php b/mod/manage.php
index 1f7c26cd8..cb845befe 100644
--- a/mod/manage.php
+++ b/mod/manage.php
@@ -168,6 +168,7 @@ function manage_content(&$a) {
 		'$channel_usage_message' => $channel_usage_message,
 		'$delegated_desc'   => t('Delegated Channel'),
 		'$delegates'        => $delegates,
+		'$locs'             => t('Manage locations')
 
 	));
 
diff --git a/view/tpl/channel.tpl b/view/tpl/channel.tpl
index d306f0aa0..17713aef4 100755
--- a/view/tpl/channel.tpl
+++ b/view/tpl/channel.tpl
@@ -44,6 +44,10 @@
 			<i class="icon-user{{if $channel.intros != 0}} new-notification{{/if}}"></i>
 			{{if $channel.intros != 0}}<a href='manage/{{$channel.channel_id}}/connections/ifpending'>{{/if}}{{$channel.intros|string_format:$intros_format}}{{if $channel.intros != 0}}</a>{{/if}}
 		</div>
+		<div class="channel-link">
+			<i class="icon-map-marker"></i>
+			<a href="manage/{{$channel.channel_id}}/locs">{{$locs}}</a>
+		</div>
 		{{/if}}
 	</div>
 </div>
diff --git a/view/tpl/channels.tpl b/view/tpl/channels.tpl
index be9017bff..1a6012926 100755
--- a/view/tpl/channels.tpl
+++ b/view/tpl/channels.tpl
@@ -1,6 +1,6 @@
 <div class="generic-content-wrapper">
 	<div class="section-title-wrapper">
-		<a class="btn btn-success btn-xs pull-right" href="{{$create.0}}" title="{{$create.1}}">{{$create.2}}</a>
+		<a class="btn btn-success btn-xs pull-right" href="{{$create.0}}" title="{{$create.1}}"><i class="icon-plus-sign"></i>&nbsp;{{$create.2}}</a>
 		<h2>{{$header}}</h2>
 	</div>
 	<div class="section-content-wrapper-np">