diff --git a/e107_plugins/pm/pm_shortcodes.php b/e107_plugins/pm/pm_shortcodes.php
index c31fe8fbe..b6a0cbd3e 100644
--- a/e107_plugins/pm/pm_shortcodes.php
+++ b/e107_plugins/pm/pm_shortcodes.php
@@ -645,10 +645,11 @@ if(!class_exists('plugin_pm_pm_shortcodes'))
 			$pm_outbox = $this->pmManager->pm_getInfo('outbox');
 			if($pm_outbox['outbox']['filled'] < 100)
 			{
-				$link = $this->url('action/new');
-				return "<a class='btn btn-mini btn-xs btn-default' href='{$link}'>".PM_SEND_LINK."</a>";
+//				$link = $this->url('action/new');
+//				return "<a class='btn btn-mini btn-xs btn-default' href='{$link}'>".LAN_PLUGIN_PM_NEW."</a>";
+				return $this->url('action/new');
 			}
-			return '';
+//			return '';
 		}
 
 
diff --git a/e107_plugins/pm/templates/pm_menu_template.php b/e107_plugins/pm/templates/pm_menu_template.php
index 0fb507213..ef8e93465 100644
--- a/e107_plugins/pm/templates/pm_menu_template.php
+++ b/e107_plugins/pm/templates/pm_menu_template.php
@@ -25,10 +25,15 @@
 
 if (!defined('e107_INIT')) { exit; }
 
-define('PM_INBOX_ICON', "<img src='".e_PLUGIN_ABS."pm/images/mail_get.png' class='icon S16' alt='".LAN_PLUGIN_PM_INBOX."' title='".LAN_PLUGIN_PM_INBOX."' />");
-define('PM_OUTBOX_ICON', "<img src='".e_PLUGIN_ABS."pm/images/mail_send.png' class='icon S16' alt='".LAN_PLUGIN_PM_OUTBOX."' title='".LAN_PLUGIN_PM_OUTBOX."' />");
-define('PM_SEND_LINK', LAN_PLUGIN_PM_NEW);
-define('NEWPM_ANIMATION', "<img src='".e_PLUGIN_ABS."pm/images/newpm.gif' alt='' />");
+//define('PM_INBOX_ICON', "<img src='".e_PLUGIN_ABS."pm/images/mail_get.png' class='icon S16' alt='".LAN_PLUGIN_PM_INBOX."' title='".LAN_PLUGIN_PM_INBOX."' />");
+define('PM_INBOX_ICON', e107::getParser()->toGlyph('fa-inbox'));
+//define('PM_OUTBOX_ICON', "<img src='".e_PLUGIN_ABS."pm/images/mail_send.png' class='icon S16' alt='".LAN_PLUGIN_PM_OUTBOX."' title='".LAN_PLUGIN_PM_OUTBOX."' />");
+// Icon candidate to stacked fontawesome icons...
+define('PM_OUTBOX_ICON', e107::getParser()->toGlyph('fa-inbox').e107::getParser()->toGlyph('fa-arrow-up'));
+//define('PM_SEND_LINK', LAN_PLUGIN_PM_NEW);
+//define('NEWPM_ANIMATION', "<img src='".e_PLUGIN_ABS."pm/images/newpm.gif' alt='' />");
+// Icon candidate to animated fontawesome icons...
+define('NEWPM_ANIMATION', e107::getParser()->toGlyph('fa-envelope'));
 /*
 $sc_style['PM_SEND_PM_LINK']['pre'] = "<br /><br />";
 $sc_style['PM_SEND_PM_LINK']['post'] = "";
@@ -45,7 +50,8 @@ $sc_style['PM_NEWPM_ANIMATE']['post'] = "</a>";
 $sc_style['PM_BLOCKED_SENDERS_MANAGE']['pre'] = "<br />[ <a href='".e_PLUGIN_ABS."pm/pm.php?blocked'>";
 $sc_style['PM_BLOCKED_SENDERS_MANAGE']['post'] = '</a> ]';
 */
-$PM_MENU_WRAPPER['PM_SEND_PM_LINK']= "<br /><br />{---}";
+//$PM_MENU_WRAPPER['PM_SEND_PM_LINK']= "<br /><br />{---}";
+$PM_MENU_WRAPPER['PM_SEND_PM_LINK']= "<a class='btn btn-mini btn-xs btn-default' href='{---}'>".LAN_PLUGIN_PM_NEW."</a>";
 $PM_MENU_WRAPPER['PM_INBOX_FILLED']=$PM_MENU_WRAPPER['PM_OUTBOX_FILLED']= "[{---}%]";
 $PM_MENU_WRAPPER['PM_NEWPM_ANIMATE']= "<a href='".e_PLUGIN_ABS."pm/pm.php?inbox'>{---}</a>";
 $PM_MENU_WRAPPER['PM_BLOCKED_SENDERS_MANAGE']= "<br />[ <a href='".e_PLUGIN_ABS."pm/pm.php?blocked'>{---}</a> ]";