diff --git a/e107_plugins/chatbox_menu/chatbox_menu_shortcodes.php b/e107_plugins/chatbox_menu/chatbox_menu_shortcodes.php
index c5290a7bc..0e0afc444 100644
--- a/e107_plugins/chatbox_menu/chatbox_menu_shortcodes.php
+++ b/e107_plugins/chatbox_menu/chatbox_menu_shortcodes.php
@@ -77,7 +77,7 @@ class chatbox_menu_shortcodes extends e_shortcode
 	{
 		$tp = e107::getParser();
 		$size = !empty($parm['size']) ? $parm['size'] : 40;
-		$options = array('h' => $size, 'w' => $size, 'crop' => 'C');
+		$options = array('h' => $size, 'w' => $size, 'crop' => 'C', 'shape'=>varset($parm['shape']));
 
 		if ( ! isset($this->var['user_image']) ) {
 			$this->init();
diff --git a/e107_plugins/chatbox_menu/templates/chatbox_menu_template.php b/e107_plugins/chatbox_menu/templates/chatbox_menu_template.php
index 659a6e06d..094436c4f 100644
--- a/e107_plugins/chatbox_menu/templates/chatbox_menu_template.php
+++ b/e107_plugins/chatbox_menu/templates/chatbox_menu_template.php
@@ -21,7 +21,7 @@ $CHATBOX_MENU_TEMPLATE['menu']['start'] =
 $CHATBOX_MENU_TEMPLATE['menu']['item'] 	= '
 <li class="media">
 <div class="media-left">
-	<span class="media-object">{CB_AVATAR}</span>
+	<span class="media-object mr-3">{CB_AVATAR: shape=circle&size=48}</span>
 </div> 
 <div class="media-body">
 	<b>{CB_USERNAME}</b>&nbsp;
diff --git a/e107_plugins/pm/templates/pm_menu_template.php b/e107_plugins/pm/templates/pm_menu_template.php
index ef02d0c84..643f8495e 100644
--- a/e107_plugins/pm/templates/pm_menu_template.php
+++ b/e107_plugins/pm/templates/pm_menu_template.php
@@ -58,7 +58,7 @@ $sc_style['PM_BLOCKED_SENDERS_MANAGE']['pre'] = "<br />[ <a href='".e_PLUGIN_ABS
 $sc_style['PM_BLOCKED_SENDERS_MANAGE']['post'] = '</a> ]';
 */
 //$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 btn-secondary' href='{---}'>".LAN_PLUGIN_PM_NEW."</a>";
+$PM_MENU_WRAPPER['PM_SEND_PM_LINK']= "<a class='btn btn-sm btn-mini btn-xs btn-default btn-secondary' 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> ]";