diff --git a/admin/inc/class.admin_categories.inc.php b/admin/inc/class.admin_categories.inc.php
index 9681e115b9..0ee6634d6d 100644
--- a/admin/inc/class.admin_categories.inc.php
+++ b/admin/inc/class.admin_categories.inc.php
@@ -260,7 +260,7 @@ class admin_categories
 		if(!$content['appname']) $content['appname'] = $appname;
 		if($content['data']['icon'])
 		{
-			$content['icon_url'] = $content['base_url'] . $content['data']['icon'];
+			$content['icon_url'] = Api\Image::find('vfs',$content['data']['icon']) ?: self::icon_url($content['data']['icon']);
 		}
 
 		$sel_options['icon'] = self::get_icons();
@@ -363,8 +363,18 @@ class admin_categories
 				}
 			}
 			$dir->close();
-			asort($icons);
 		}
+
+		// Get custom icons
+		$map = Api\Image::map();
+		if(array_key_exists('vfs', $map))
+		{
+			foreach($map['vfs'] as $name => $path)
+			{
+				$icons[$name] = $name;
+			}
+		}
+		asort($icons);
 		return $icons;
 	}
 
@@ -420,7 +430,7 @@ class admin_categories
 				$row['level_spacer'] = str_repeat('    ',$row['level']);
 			}
 
-			if ($row['data']['icon']) $row['icon_url'] = self::icon_url($row['data']['icon']);
+			if ($row['data']['icon']) $row['icon_url'] = Api\Image::find('vfs',$row['data']['icon']) ?: self::icon_url($row['data']['icon']);
 
 			$row['subs'] = $row['children'] ? count($row['children']) : 0;
 
diff --git a/admin/templates/default/app.css b/admin/templates/default/app.css
index 025ad4b7ca..fcbe888edf 100644
--- a/admin/templates/default/app.css
+++ b/admin/templates/default/app.css
@@ -179,6 +179,9 @@ select#admin-mailaccount_ident_id {
 #admin-acl {width:99%;}
 
 #admin-categories-edit_owner {overflow-y: auto;}
+#admin-categories-edit_icon_url {
+	max-width: 32px;
+}
 
 /*
 Admin command
diff --git a/admin/templates/pixelegg/app.css b/admin/templates/pixelegg/app.css
index 1fdd42d16f..91eb4fed04 100755
--- a/admin/templates/pixelegg/app.css
+++ b/admin/templates/pixelegg/app.css
@@ -187,6 +187,9 @@ select#admin-mailaccount_ident_id {
 #admin-categories-edit_owner {
   overflow-y: auto;
 }
+#admin-categories-edit_icon_url {
+  max-width: 32px;
+}
 /*
 Admin command
 */
@@ -209,7 +212,7 @@ Admin command
 @media all {
   div.dhtmlxTree td.standartTreeRow span.selectedTreeRow {
     background-color: rgba(102, 153, 204, 0.7);
-    color: #1E1E1E;
+    color: #1e1e1e;
   }
   /* #############################################################################
 	// iframe