diff --git a/public/src/admin/general/navigation.js b/public/src/admin/general/navigation.js
index a746966fbd..7dfe1af0e2 100644
--- a/public/src/admin/general/navigation.js
+++ b/public/src/admin/general/navigation.js
@@ -33,6 +33,7 @@ define('admin/general/navigation', ['translator', 'iconSelect'], function(transl
 				var index = iconEl.parents('[data-index]').attr('data-index');
 				$('#active-navigation [data-index="' + index + '"] i').attr('class', 'fa fa-fw ' + newIconClass);
 				iconEl.siblings('[name="iconClass"]').val(newIconClass);
+				iconEl.siblings('.change-icon-link').toggleClass('hidden', !!newIconClass);
 			});
 		});
 
diff --git a/src/views/admin/general/navigation.tpl b/src/views/admin/general/navigation.tpl
index 16775ef9ac..6c2c8e8e2d 100644
--- a/src/views/admin/general/navigation.tpl
+++ b/src/views/admin/general/navigation.tpl
@@ -5,9 +5,8 @@
 				<!-- BEGIN navigation -->
 				<li data-index="{navigation.index}" class="{navigation.class} <!-- IF navigation.selected --> active <!-- ENDIF navigation.selected -->">
 					<a href="#" title="{navigation.route}" id="{navigation.id}">
-						<!-- IF navigation.iconClass -->
-						<i class="fa fa-fw {navigation.iconClass}"></i>
-						<!-- ENDIF navigation.iconClass -->
+
+						<i class="fa fa-fw <!-- IF navigation.iconClass -->{navigation.iconClass}<!-- ENDIF navigation.iconClass -->"></i>
 
 						<!-- IF navigation.text -->
 						<span class="{navigation.textClass}">{navigation.text}</span>
@@ -31,6 +30,7 @@
 								<label>Icon:</label>
 								<br/>
 								<span class="iconPicker"><i class="fa fa-2x {enabled.iconClass}"></i>
+									<a class="change-icon-link <!-- IF enabled.iconClass -->hidden<!-- ENDIF enabled.iconClass -->" href="#">change</a>
 									<input class="form-control" type="hidden" name="iconClass" value="{enabled.iconClass}" />
 								</span>
 							</div>