diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index 91149f31f..47ba80dec 100755
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -2777,7 +2777,7 @@ class e_admin_controller_ui extends e_admin_controller
 
 	/**
 	 *
-	 * @param string $field
+	 * @param string|array $field
 	 * @param string $key attribute name
 	 * @param mixed $value default value if not set, default is null
 	 * @return e_admin_controller_ui
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index 5e17a3df7..403c3d098 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -960,8 +960,8 @@ class e_form
 	{
 		if(deftrue('e_DEBUG_MEDIAPICKER'))
 		{
-			$options['icons'] = 1;
-			$options['glyphs'] = 1;
+			$options['icon'] = 1;
+			$options['glyph'] = 1;
 			$options['w'] = 64;
 			$options['h'] = 64;
 
@@ -1448,9 +1448,9 @@ class e_form
 
 		$class = '';
 
-		if($parms['icons'])
+		if($parms['icon'])
 		{
-			$class = 'mediaselector-container-icons';
+			$class = 'mediaselector-container-icon';
 			$parms['type'] = 'icon';
 		}
 
@@ -1479,7 +1479,7 @@ class e_form
 		}
 
 
-		if(!empty($parms['icons'])) // empty overlay without button.
+		if(!empty($parms['icon'])) // empty overlay without button.
 		{
 			$parms['class'] = '';
 			$editIcon = $this->mediaUrl($cat, "<span><!-- --></span>", $name_id,$parms);