diff --git a/e107_admin/includes/flexpanel.php b/e107_admin/includes/flexpanel.php
index 289b92e04..0b48094bd 100644
--- a/e107_admin/includes/flexpanel.php
+++ b/e107_admin/includes/flexpanel.php
@@ -177,15 +177,25 @@ class adminstyle_flexpanel extends adminstyle_infopanel
 			$user_pref['core-infopanel-mye107'] = e107::getNav()->getDefaultAdminPanelArray();
 		}
 
-
 		$ns->setStyle('flexpanel');
 		$mainPanel = "<div id='core-infopanel_mye107'>";
 		$mainPanel .= "<div class='left'>";
+		$count = 0;
 		foreach($this->iconlist as $key => $val)
 		{
 			if(in_array($key, $user_pref['core-infopanel-mye107']))
 			{
-				$mainPanel .= e107::getNav()->renderAdminButton($val['link'], $val['title'], $val['caption'], $val['perms'], $val['icon_32'], "div");
+				if($tmp = e107::getNav()->renderAdminButton($val['link'], $val['title'], $val['caption'], $val['perms'], $val['icon_32'], "div"))
+				{
+					$mainPanel .= $tmp;
+					$count++;
+				}
+				
+			}
+
+			if($count == 20)
+			{
+				break;
 			}
 		}
 		$mainPanel .= "</div></div>";
diff --git a/e107_admin/includes/infopanel.php b/e107_admin/includes/infopanel.php
index c85dad49a..09b6834e3 100755
--- a/e107_admin/includes/infopanel.php
+++ b/e107_admin/includes/infopanel.php
@@ -245,12 +245,22 @@ class adminstyle_infopanel
 		";
 
 		$mainPanel .= "<div class='left'>";
-			
+			$count = 0;
 			foreach ($this->iconlist as $key=>$val)
 			{
-				if (in_array($key, $user_pref['core-infopanel-mye107']))
+				if(in_array($key, $user_pref['core-infopanel-mye107']))
 				{
-					$mainPanel .= e107::getNav()->renderAdminButton($val['link'], $val['title'], $val['caption'], $val['perms'], $val['icon_32'], "div");
+					if($tmp = e107::getNav()->renderAdminButton($val['link'], $val['title'], $val['caption'], $val['perms'], $val['icon_32'], "div"))
+					{
+						$mainPanel .= $tmp;
+						$count++;
+					}
+
+				}
+
+				if($count == 20)
+				{
+					break;
 				}
 			}
 	
@@ -259,7 +269,7 @@ class adminstyle_infopanel
 	      
 			</div>";
 
-		e107::getDebug()->log($this->iconlist);
+	//	e107::getDebug()->log($this->iconlist);
 
 		$caption = $tp->lanVars(LAN_CONTROL_PANEL, ucwords(USERNAME));
 
diff --git a/e107_handlers/sitelinks_class.php b/e107_handlers/sitelinks_class.php
index 7faa3b394..a30ac9675 100644
--- a/e107_handlers/sitelinks_class.php
+++ b/e107_handlers/sitelinks_class.php
@@ -978,19 +978,11 @@ i.e-cat_users-32{ background-position: -555px 0; width: 32px; height: 32px; }
 				'e-eurl'
 			);
 
-		$count = 0;
-
 		foreach($iconlist as $k=>$v)
 		{
-			if($count === 20)
-			{
-				break;
-			}
-
 			if(!in_array($k,$exclude))
 			{
 				$defArray[] = $k;
-				$count++;
 			}
 		}