diff --git a/e107_files/shortcode/batch/bbcode_shortcodes.php b/e107_files/shortcode/batch/bbcode_shortcodes.php
index a4b9b8af7..62e02b712 100644
--- a/e107_files/shortcode/batch/bbcode_shortcodes.php
+++ b/e107_files/shortcode/batch/bbcode_shortcodes.php
@@ -9,9 +9,9 @@
  *
  *
  * $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/bbcode_shortcodes.php,v $
- * $Revision: 1.16 $
- * $Date: 2009-11-18 01:04:43 $
- * $Author: e107coders $
+ * $Revision: 1.17 $
+ * $Date: 2010-01-09 15:06:37 $
+ * $Author: secretr $
  */
 
 if (!defined('e107_INIT')) { exit; }
@@ -114,7 +114,7 @@ class bbcode_shortcodes
 
 		if($bbcode[$parm])  // default - insert text.
 		{
-			$text = "\n<img class='bbcode bbcode_buttons' style='cursor:pointer' src='".$iconpath[$parm]."' alt='' title='".$_helptxt."' onclick=\"{$_onclick_func}('".$_onclick_var."')\" ".($bbcode_helpactive ? "onmouseout=\"{$bbcode_help}(''{$bbcode_tag})\" onmouseover=\"{$bbcode_help}('".$_helptxt."'{$bbcode_tag})\"" : "" )." />\n";
+			$text = "\n<img class='bbcode bbcode_buttons e-pointer' src='".$iconpath[$parm]."' alt='' title='".$_helptxt."' onclick=\"{$_onclick_func}('".$_onclick_var."')\" ".($bbcode_helpactive ? "onmouseout=\"{$bbcode_help}(''{$bbcode_tag})\" onmouseover=\"{$bbcode_help}('".$_helptxt."'{$bbcode_tag})\"" : "" )." />\n";
 		}
 
 		if($_function)
diff --git a/e107_files/shortcode/batch/comment_shortcodes.php b/e107_files/shortcode/batch/comment_shortcodes.php
index 2ca95a343..f2bcff2ce 100644
--- a/e107_files/shortcode/batch/comment_shortcodes.php
+++ b/e107_files/shortcode/batch/comment_shortcodes.php
@@ -9,9 +9,9 @@
  *
  *
  * $Source: /cvs_backup/e107_0.8/e107_files/shortcode/batch/comment_shortcodes.php,v $
- * $Revision: 1.14 $
- * $Date: 2009-11-18 01:04:43 $
- * $Author: e107coders $
+ * $Revision: 1.15 $
+ * $Date: 2010-01-09 15:06:37 $
+ * $Author: secretr $
  */
 
 if (!defined('e107_INIT')) { exit; }
@@ -128,7 +128,7 @@ SC_END
 SC_BEGIN IPADDRESS
 global $IPADDRESS, $comrow, $e107;
 //require_once(e_HANDLER."encrypt_handler.php");
-return (ADMIN ? "<a href='".e_BASE."userposts.php?0.comments.".$comrow['user_id']."'>".COMLAN_330." ".$e107->ipDecode($comrow['comment_ip'])."</a>" : "");
+return (ADMIN ? "<a href='".SITEURL."userposts.php?0.comments.".$comrow['user_id']."'>".COMLAN_330." ".$e107->ipDecode($comrow['comment_ip'])."</a>" : "");
 SC_END
 
 SC_BEGIN LEVEL
diff --git a/e107_plugins/rss_menu/rss_menu.php b/e107_plugins/rss_menu/rss_menu.php
index 1e8a058ba..ea60bf335 100644
--- a/e107_plugins/rss_menu/rss_menu.php
+++ b/e107_plugins/rss_menu/rss_menu.php
@@ -9,9 +9,9 @@
  *
  *
  * $Source: /cvs_backup/e107_0.8/e107_plugins/rss_menu/rss_menu.php,v $
- * $Revision: 1.7 $
- * $Date: 2009-11-18 01:06:01 $
- * $Author: e107coders $
+ * $Revision: 1.8 $
+ * $Date: 2010-01-09 15:06:36 $
+ * $Author: secretr $
  */
 
 if (!defined('e107_INIT')) { exit; }
@@ -20,8 +20,9 @@ if (!plugInstalled('rss_menu'))
 	return '';
 }
 
-global $FILES_DIRECTORY,$pref,$sql;
-$path = e_PLUGIN."rss_menu/";
+$FILES_DIRECTORY = e107::getInstance()->getFolder('files');
+$sql = e107::getDb();
+$path = e_PLUGIN_ABS."rss_menu/";
 include_lan(e_PLUGIN."rss_menu/languages/".e_LANGUAGE."_admin_rss_menu.php");
 
 $des = "";
@@ -62,7 +63,7 @@ if(!$des)
 	$type = 1;
 	$des = RSS_MENU_L3;
 }
-if(e_PAGE == "news.php" && $pref['rss_newscats'])
+if(e_PAGE == "news.php" && e107::getPref('rss_newscats'))
 {
 
 	$qry = explode(".",e_QUERY);
@@ -73,14 +74,15 @@ if(e_PAGE == "news.php" && $pref['rss_newscats'])
 }
 
 $text = "
-<div style='text-align:center' class='smalltext'>
-".$des.RSS_MENU_L1."<br />
-<div class='spacer'><a href='".$path."rss.php?$type.1".($topic ? ".".$topic : "")."'><img src='".$path."images/rss1.png' alt='rss1.0' /></a></div>
-<div class='spacer'><a href='".$path."rss.php?$type.2".($topic ? ".".$topic : "")."'><img src='".$path."images/rss2.png' alt='rss2.0' /></a></div>
-<div class='spacer'><a href='".$path."rss.php?$type.3".($topic ? ".".$topic : "")."'><img src='".$path."images/rss3.png' alt='rdf' /></a><br /></div>
-<div class='spacer'><a href='".$path."rss.php?$type.4".($topic ? ".".$topic : "")."'><img src='".$path."images/rss4.png' alt='atom' /></a><br /></div>
+<div>
+	".$des.RSS_MENU_L1."<br />
+	<div class='spacer'><a href='".$path."rss.php?$type.1".($topic ? ".".$topic : "")."'><img src='".$path."images/rss1.png' alt='rss1.0' /></a></div>
+	<div class='spacer'><a href='".$path."rss.php?$type.2".($topic ? ".".$topic : "")."'><img src='".$path."images/rss2.png' alt='rss2.0' /></a></div>
+	<div class='spacer'><a href='".$path."rss.php?$type.3".($topic ? ".".$topic : "")."'><img src='".$path."images/rss3.png' alt='rdf' /></a></div>
+	<div class='spacer'><a href='".$path."rss.php?$type.4".($topic ? ".".$topic : "")."'><img src='".$path."images/rss4.png' alt='atom' /></a></div>
 </div>";
 
-$caption = (file_exists(THEME."images/RSS_menu.png") ? "<img src='".THEME_ABS."images/RSS_menu.png' alt='' style='vertical-align:middle' /> ".RSS_MENU_L2 : RSS_MENU_L2);
-$ns->tablerender($caption, $text, 'backend');
+// Deprecated - can be controlled within tablestyle (theme) - case mod == 'rss_menu'
+//$caption = (file_exists(THEME."images/RSS_menu.png") ? "<img src='".THEME_ABS."images/RSS_menu.png' alt='' style='vertical-align:middle' /> ".RSS_MENU_L2 : RSS_MENU_L2);
+e107::getRender()->tablerender(RSS_MENU_L2, $text, 'rss_menu');
 ?>
\ No newline at end of file