diff --git a/controller/translationcontroller.php b/controller/translationcontroller.php
index a3232a9a..46f95c44 100644
--- a/controller/translationcontroller.php
+++ b/controller/translationcontroller.php
@@ -141,6 +141,7 @@ class TranslationController extends ApiController {
 			'add.tag' => $this->trans->t('Add tag'),
 			'pick.icon' => $this->trans->t('Pick an icon'),
             'pick.icon.search' => $this->trans->t('Search icons'),
+            'pick.icon.custom.label' => $this->trans->t('Upload a custom icon:'),
 			'use.icon' => $this->trans->t('Use this icon'),
 			'selected.icon' => $this->trans->t('Selected icon'),
 
diff --git a/templates/views/partials/icon-picker.html b/templates/views/partials/icon-picker.html
index bf1e3480..8c06aa10 100644
--- a/templates/views/partials/icon-picker.html
+++ b/templates/views/partials/icon-picker.html
@@ -1,6 +1,7 @@
 <div>
 	<div class="cell">
 		<credential-icon credential="credential"></credential-icon>
+		<div ng-if="credential.icon.content" style="width: 16px;"></div>
 	</div>
 	<div style="display: none" id="iconPicker" title="{{ 'pick.icon' | translate }}">
 		<div class="iconList">
@@ -13,6 +14,7 @@
 		</div>
 		<div class="iconModifier">
 			<input id="iconPicker-Search" class="iconSearch" type="text" placeholder="{{ 'pick.icon.search' | translate }}">
+			<label for="iconPicker-CustomIcon">{{ 'pick.icon.custom.label' | translate }}<label>
             <input id="iconPicker-CustomIcon" class="iconSearch"  type="file"/>
 			<!--
 			<div ng-repeat="(groupName, icons) in iconGroups">