diff --git a/e107_admin/header.php b/e107_admin/header.php
index 2716938cf..e1566aefd 100644
--- a/e107_admin/header.php
+++ b/e107_admin/header.php
@@ -62,12 +62,7 @@ function loadJSAddons()
 	e107::js('footer', '{e_WEB}js/core/admin.jquery.js', 'jquery', 5); // Load all default functions.
 	e107::js('footer', '{e_WEB}js/core/all.jquery.js', 'jquery', 5); // Load all default functions.
 
-	$plUpload = 'plupload/i18n/' . e_LAN . '.js';
 
-	if(e_LAN != 'en' && file_exists(e_WEB_JS . $plUpload))
-	{
-		e107::js('footer', e_WEB_JS . $plUpload, 'jquery', 5);
-	}
 }
 
 
diff --git a/e107_admin/image.php b/e107_admin/image.php
index 1996a38bc..ae28a9e25 100644
--- a/e107_admin/image.php
+++ b/e107_admin/image.php
@@ -40,6 +40,12 @@ if(varset($_GET['action']) === 'youtube' )
 e107::js('core', 'plupload/plupload.full.min.js', 'jquery', 2);
 e107::css('core', 'plupload/jquery.plupload.queue/css/jquery.plupload.queue.css', 'jquery');
 e107::js('core', 'plupload/jquery.plupload.queue/jquery.plupload.queue.min.js', 'jquery', 2);
+	$plUpload = 'plupload/i18n/' . e_LAN . '.js';
+
+	if(e_LAN != 'en' && file_exists(e_WEB_JS . $plUpload))
+	{
+		e107::js('footer', e_WEB_JS . $plUpload, 'jquery', 5);
+	}
 e107::js('core', 'core/mediaManager.js', 'jquery',5);
 // issue #3051 Preview url is wrong when target page is a plugin
 // Using this variable to check for the plugins directory and replace with empty space in case of...
diff --git a/e107_plugins/chatbox_menu/chatbox_menu.php b/e107_plugins/chatbox_menu/chatbox_menu.php
index f66da9666..ffae3e4d1 100755
--- a/e107_plugins/chatbox_menu/chatbox_menu.php
+++ b/e107_plugins/chatbox_menu/chatbox_menu.php
@@ -218,7 +218,7 @@ else
 	if(!empty($pref['cb_emote']) && !empty($pref['smiley_activate']))
 	{
 		$texta .= "
-		<input class='btn btn-default btn-secondary button' type='button' style='cursor:pointer' size='30' value='" . CHATBOX_L14 . "' onclick=\"expandit('emote')\" />
+		<input class='btn btn-sm btn-default btn-secondary button' type='button' style='cursor:pointer' size='30' value='" . CHATBOX_L14 . "' onclick=\"expandit('emote')\" />
 		<div class='well' style='display:none' id='emote'>" . r_emote() . "</div>\n";
 	}