diff --git a/e107_plugins/social/e_shortcode.php b/e107_plugins/social/e_shortcode.php
index 53a5cb8ac..7f56b06fc 100644
--- a/e107_plugins/social/e_shortcode.php
+++ b/e107_plugins/social/e_shortcode.php
@@ -73,7 +73,8 @@ class social_shortcodes extends e_shortcode
  			
 		
 	
-		$class = (vartrue($parm['size'])) ?  'fa-'.$parm['size'] : '';
+		$class      = (vartrue($parm['size'])) ?  'fa-'.$parm['size'] : '';
+		$tooltipPos = vartrue($parm['tip-pos'], 'top');
 
 		$text = '';
 
@@ -83,7 +84,7 @@ class social_shortcodes extends e_shortcode
 			if($data['href'] != '')
 			{
 
-				 $text .= '<a rel="external" href="'.$data['href'].'" class="e-tip social-icon social-'.$id.'" title="'.$data['title'].'"><span class="fa fa-'.$id.' '.$class.'"></span></a>';
+				 $text .= '<a rel="external" href="'.$data['href'].'" data-tooltip-position="'.$tooltipPos.'" class="e-tip social-icon social-'.$id.'" title="'.$data['title'].'"><span class="fa fa-'.$id.' '.$class.'"></span></a>';
 				 $text .= "\n";
 			}
 		}
diff --git a/e107_web/js/core/all.jquery.js b/e107_web/js/core/all.jquery.js
index 6e85c635a..e60924ef6 100644
--- a/e107_web/js/core/all.jquery.js
+++ b/e107_web/js/core/all.jquery.js
@@ -851,8 +851,30 @@ $(document).ready(function()
 		
 
 		
-		// 	Tooltips for bbarea. 
-		$(".bbcode_buttons, a.e-tip").tooltip({placement: 'top',opacity: 1.0, fade: true,html: true, container:'body'});
+		// 	Tooltips for bbarea.
+
+		$(".bbcode_buttons, a.e-tip").each(function() {
+
+			var tip = $(this).attr('title');
+
+			if(tip === undefined)
+			{
+				return;
+			}
+
+			var pos = $(this).attr('data-tooltip-position');
+
+			if(pos === undefined)
+			{
+				pos = 'top';
+			}
+
+			$(this).tooltip({opacity:1.0, fade:true, placement: pos, container: 'body'});
+			// $(this).css( 'cursor', 'pointer' )
+		});
+
+		
+	//	$(".bbcode_buttons, a.e-tip").tooltip({placement: 'top',opacity: 1.0, fade: true,html: true, container:'body'});
 	//	$("a.e-tip").tipsy({gravity: 'w',opacity: 1.0, fade: true,html: true});
 	//	var tabs = $('#tab-container').clone(true);
 	//	$('#htmlEditor').append(tabs);