diff --git a/e107_plugins/rss_menu/rss_shortcodes.php b/e107_plugins/rss_menu/rss_shortcodes.php
index 689ce13a1..2ae76b8e1 100644
--- a/e107_plugins/rss_menu/rss_shortcodes.php
+++ b/e107_plugins/rss_menu/rss_shortcodes.php
@@ -47,6 +47,19 @@ class rss_menu_shortcodes extends e_shortcode
 		$url4 = e107::url('rss_menu','atom', $row);
 
 
+		if(deftrue('BOOTSTRAP') === 3) // v2.x
+		{
+			$text = "
+			<div>
+				<a class='btn btn-sm btn-default'  href='".e107::url('rss_menu', 'rss', $row)."' title='RSS 2.0'>".$tp->toGlyph('fa-rss')." RSS</a>
+				<a class='btn btn-sm btn-default'  href='".e107::url('rss_menu', 'atom', $row)."' title='ATOM'>".$tp->toGlyph('fa-rss')." Atom</a>
+			</div>";
+
+			return $text;
+		}
+
+
+
 		$text = "";
 	//	$text .= "<a href='".$url1."' class='rss'><img src='".e_PLUGIN_ABS."rss_menu/images/rss1.png' class='icon' alt='RSS 0.92' /></a>";
 		$text .= "<a href='".$url2."' class='rss'><img src='".e_PLUGIN_ABS."rss_menu/images/rss2.png' class='icon' alt='RSS 2.0' /></a>";
diff --git a/e107_plugins/rss_menu/rss_template.php b/e107_plugins/rss_menu/rss_template.php
index 76d30e1a0..a7142008e 100644
--- a/e107_plugins/rss_menu/rss_template.php
+++ b/e107_plugins/rss_menu/rss_template.php
@@ -5,9 +5,9 @@ if(!defined("USER_WIDTH")){ define("USER_WIDTH","width:100%"); }
 // Rss listing
 if(!isset($RSS_LIST_HEADER))
 {
-	$RSS_LIST_HEADER = "<table class='table table-striped fborder' style='".USER_WIDTH."'>
+	$RSS_LIST_HEADER = "<table class='table table-striped table-bordered fborder' style='".USER_WIDTH."'>
 		<tr>
-			<th class='fcaption' style='width:55%'> </th>
+			<th class='fcaption' style='width:70%'> </th>
 			<th class='fcaption' style='text-align:right'>".RSS_PLUGIN_LAN_6."</th>
 		</tr>";
 }
@@ -16,7 +16,7 @@ if(!isset($RSS_LIST_TABLE))
 	$RSS_LIST_TABLE = "
 	<tr>
 		<td class='forumheader3'>{RSS_FEED}<br />
-		<span class='smalltext' >{RSS_TEXT}</span>
+		<span class='smalltext' ><small>{RSS_TEXT}</small></span>
 		</td>
 	<td class='forumheader3' style='text-align:right'>
     	{RSS_TYPES}
diff --git a/e107_plugins/social/e_shortcode.php b/e107_plugins/social/e_shortcode.php
index 99a961b02..666435807 100644
--- a/e107_plugins/social/e_shortcode.php
+++ b/e107_plugins/social/e_shortcode.php
@@ -22,7 +22,7 @@ class social_shortcodes extends e_shortcode
 	{
 							
 		$social = array(
-			'rss'			=> array('href'=> (e107::isInstalled('rss_menu') ? e_PLUGIN_ABS."rss_menu/rss.php?news.2" : ''), 'title'=>'Feed'),
+			'rss'			=> array('href'=> (e107::isInstalled('rss_menu') ? e107::url('rss_menu', 'index', array('rss_url'=>'news')) : ''), 'title'=>'Feed'),
 			'facebook'		=> array('href'=> deftrue('XURL_FACEBOOK'), 	'title'=>'Facebook'),
 			'twitter'		=> array('href'=> deftrue('XURL_TWITTER'),		'title'=>'Twitter'),
 			'google-plus'	=> array('href'=> deftrue('XURL_GOOGLE'),		'title'=>'Google Plus'),
@@ -73,7 +73,7 @@ class social_shortcodes extends e_shortcode
 		}
 		
 		$sc = e107::getScBatch('signup');
-		$text .= "<p>Sign in with:</p>";
+		$text = "<p>Sign in with:</p>";
 		$text .= $sc->sc_signup_xup_login($parm);
 		$text .= "
 		<div class='clearfix'></div><hr class='clearfix' />";