diff --git a/e107_plugins/social/e_menu.php b/e107_plugins/social/e_menu.php
index 57ebc9cd8..c9c40edc9 100644
--- a/e107_plugins/social/e_menu.php
+++ b/e107_plugins/social/e_menu.php
@@ -32,12 +32,12 @@ class social_menu
 		}
 
 		$templates = e107::getLayouts('social','social_xurl', 'front', null, false, false);
-		$sizes = array('2x'=> '2x', '3x'=>'3x', '4x'=>'4x', '5x'=>'5x');
+	//	$sizes = array('2x'=> '2x', '3x'=>'3x', '4x'=>'4x', '5x'=>'5x');
 
 		$fields = array();
 		$fields['caption']      = array('title'=> "Caption", 'type'=>'text', 'multilan'=>true, 'writeParms'=>array('size'=>'xxlarge'));
 		$fields['template']     = array('title'=> LAN_TEMPLATE, 'type'=>'dropdown', 'tab'=>0, 'writeParms'=>array('optArray'=>$templates));
-		$fields['size']     = array('title'=> "Size", 'type'=>'dropdown', 'tab'=>0, 'writeParms'=>array('optArray'=>$sizes));
+	//	$fields['size']     = array('title'=> "Size", 'type'=>'dropdown', 'tab'=>0, 'writeParms'=>array('optArray'=>$sizes));
 
 
         return $fields;
diff --git a/e107_plugins/social/e_shortcode.php b/e107_plugins/social/e_shortcode.php
index 70cb71d81..fbf9ced1f 100644
--- a/e107_plugins/social/e_shortcode.php
+++ b/e107_plugins/social/e_shortcode.php
@@ -85,22 +85,11 @@ class social_shortcodes extends e_shortcode
  			
 		// print_a($social);
 	
-		$class      = (vartrue($parm['size'])) ?  'fa-'.$parm['size'] : '';
+		$class      = (!empty($parm['size'])) ?  'fa-'.$parm['size'] : '';
+		$class      .= (isset($parm['class'])) ? (string) $parm['class'] : $class;
 
-		// @deprecated - use template.
-		/*
-		$tooltipPos = vartrue($parm['tip-pos'], 'top');
 
-		if(isset($parm['tip']))
-		{
-			$tooltip = ($parm['tip'] == 'false' || empty($parm['tooltip'])) ? '' : 'e-tip';
-		}
-		else
-		{
-			$tooltip = 'e-tip';
-		}
-
-	*/	if(!empty($parm['type']))
+		if(!empty($parm['type']))
 		{
 			$newList = array();
 			$tmp = explode(",",$parm['type']);