diff --git a/e107_admin/users.php b/e107_admin/users.php
index a24d37c80..ccb4f5c90 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -1220,10 +1220,10 @@ class users_admin_ui extends e_admin_ui
 
 		<tr>
 			<td>".USRLAN_128."</td>
-			<td>
+			<td ><div class='form-inline'>
 			".$frm->text('loginname', varset($user_data['user_loginname']), varset($pref['loginname_maxlength'], 30))."&nbsp;&nbsp;
 			".$frm->checkbox_label(USRLAN_170, 'generateloginname', 1, varset($pref['predefinedLoginName'], false))."
-			</td>
+			</div></td>
 		</tr>
 
 		<tr>
diff --git a/e107_core/shortcodes/batch/bbcode_shortcodes.php b/e107_core/shortcodes/batch/bbcode_shortcodes.php
index b74e17dc3..7de743cc7 100644
--- a/e107_core/shortcodes/batch/bbcode_shortcodes.php
+++ b/e107_core/shortcodes/batch/bbcode_shortcodes.php
@@ -50,7 +50,7 @@ class bbcode_shortcodes extends e_shortcode
 		$data = "[table][tr][td]Cell 1[/td][td]Cell 2[/td][/tr][/table]";
 		$event = $this->getEvent('addtext',$data,'Insert a table',1);
 		$text = "<a {$event} class='e-bb' id='{$id}' data-function='insert' href='#{$this->var['tagid']}'  data-bbcode='{$data}'>";
-		$text .= "<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/table.png' alt='' title='Insert a table' /></a>";
+		$text .= "<img class='btn btn-small bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/table.png' alt='' title='Insert a table' /></a>";
 		return $text;
 	}
 	
@@ -74,7 +74,7 @@ class bbcode_shortcodes extends e_shortcode
 	//	$data = "[list]\n[*]Item 1\n[*]Item 2\n[/list]"; // works with jquery, but not onclick. 
 		$event = $this->getEvent('addtext',$data,LANHELP_36);
 		$text = "<a {$event} class='e-bb' id='{$id}' data-function='insert' href='#{$this->var['tagid']}' data-bbcode='{$data}'>";
-		$text .= "<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/list.png' alt='' title='".nl2br(LANHELP_36)."' /></a>";
+		$text .= "<img class='btn btn-small bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/list.png' alt='' title='".nl2br(LANHELP_36)."' /></a>";
 		return $text;
 	}
 	
@@ -83,7 +83,7 @@ class bbcode_shortcodes extends e_shortcode
 		$data = "[youtube]*[/youtube]";
 		$event = $this->getEvent('addinput',$data,LANHELP_48);
 		$text = "<a {$event} class='e-bb' id='{$id}' data-function='input' href='#{$this->var['tagid']}'  data-bbcode='{$data}'>";
-		$text .="<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/youtube.png' alt='' title='".nl2br(LANHELP_48)."' /></a>";
+		$text .="<img class='btn btn-small bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/youtube.png' alt='' title='".nl2br(LANHELP_48)."' /></a>";
 		return $text;
 	}
 	
@@ -92,7 +92,7 @@ class bbcode_shortcodes extends e_shortcode
 		$data = "[link=*]*[/link]";
 		$event = $this->getEvent('addinput',$data,LANHELP_35);
 		$text = "<a {$event} class='e-bb ' id='{$id}' data-function='input' href='#{$this->var['tagid']}'  data-bbcode='{$data}'>\n";
-		$text .="<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/link.png' alt='' title='".nl2br(LANHELP_23)."' /></a>";
+		$text .="<img class='btn btn-small bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/link.png' alt='' title='".nl2br(LANHELP_23)."' /></a>";
 		return $text;
 	}
 	
@@ -108,7 +108,7 @@ class bbcode_shortcodes extends e_shortcode
 			list($tag,$tmp) = explode("--",$this->var['tagid']); // works with $frm->bbarea to detect textarea from first half of tag. 
 		}
 		$text = "<a class='e-dialog' title='Media Manager : ".$this->var['template']."' id='{$id}' href='".e_ADMIN."image.php?mode=main&action=dialog&for=".$this->var['template']."&tagid=".$tag."&iframe=1&bbcode=img'  >";
-		$text .= "<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/preimage.png' title='".LANHELP_45."' alt='' />";
+		$text .= "<img class='btn btn-small  bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/preimage.png' title='".LANHELP_45."' alt='' />";
 		$text .= "</a>\n";
 		return $text;
 	}
@@ -123,8 +123,8 @@ class bbcode_shortcodes extends e_shortcode
 		{
 			list($tag,$tmp) = explode("--",$this->var['tagid']); // works with $frm->bbarea to detect textarea from first half of tag. 
 		}
-		$text = "<a class='e-dialog' id='{$id}' href='".e_ADMIN."image.php?mode=dialog&action=list&for=_common_file&tagid=".$tag."&iframe=1&bbcode=file'  >";
-		$text .= "<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/prefile.png' title='".LANHELP_39."' alt='' />";
+		$text = "<a class=' e-dialog' id='{$id}' href='".e_ADMIN."image.php?mode=dialog&action=list&for=_common_file&tagid=".$tag."&iframe=1&bbcode=file'  >";
+		$text .= "<img class='btn btn-small bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/prefile.png' title='".LANHELP_39."' alt='' />";
 		$text .= "</a>\n";
 		return $text;
 	}	
@@ -136,8 +136,8 @@ class bbcode_shortcodes extends e_shortcode
 		 $formid = $id."_";
 
 		 $event = $this->getEvent('expandit',$formid, LANHELP_22);
-		$text = "<a {$event} class='e-bb e-expandit'  onclick=\"expandit('{$this->var['tagid']}')\" data-function='show' href='#{$this->var['tagid']}' title='".LANHELP_22."' data-bbcode='{$data}'>
-		<img class='bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/fontsize.png' alt='' title='".LANHELP_22."' /></a>";
+		$text = "<a {$event} class=' e-bb e-expandit'  onclick=\"expandit('{$this->var['tagid']}')\" data-function='show' href='#{$this->var['tagid']}' title='".LANHELP_22."' data-bbcode='{$data}'>
+		<img class='btn btn-small bbcode_buttons e-pointer' src='".e_IMAGE_ABS."bbcode/fontsize.png' alt='' title='".LANHELP_22."' /></a>";
 		
 		
 		$text .="<!-- Start of Size selector -->
@@ -378,7 +378,7 @@ class bbcode_shortcodes extends e_shortcode
 
 		if($_onclick_func == 'e-dialog')
 		{  //  $tagid = "news-body";
-			$pre = "\n<a href='".e_ADMIN."image.php?mode=main&action=dialog&for=news&tagid=".$tagid."&iframe=1&bbcode=1' class='e-dialog' >";
+			$pre = "\n<a href='".e_ADMIN."image.php?mode=main&action=dialog&for=news&tagid=".$tagid."&iframe=1&bbcode=1' class='btn btn-small e-dialog' >";
 			$post = "</a>\n";	
 		}
 		
@@ -388,7 +388,7 @@ class bbcode_shortcodes extends e_shortcode
 		if($bbcode[$parm])  // default - insert text.
 		{
 			$text = $pre;
-			$text .= "<img class='bbcode bbcode_buttons e-pointer' src='".$iconpath[$parm]."' alt='' title=\"".nl2br($_helptxt)."\" onclick=\"{$_onclick_func}('".$_onclick_var."')\" ".($bbcode_helpactive ? "onmouseout=\"{$bbcode_help}(''{$bbcode_tag})\" onmouseover=\"{$bbcode_help}('".$_helptxt."'{$bbcode_tag})\"" : "" )." />";
+			$text .= "<img class='btn btn-small bbcode bbcode_buttons e-pointer' src='".$iconpath[$parm]."' alt='' title=\"".nl2br($_helptxt)."\" onclick=\"{$_onclick_func}('".$_onclick_var."')\" ".($bbcode_helpactive ? "onmouseout=\"{$bbcode_help}(''{$bbcode_tag})\" onmouseover=\"{$bbcode_help}('".$_helptxt."'{$bbcode_tag})\"" : "" )." />";
 			$text .= $post;
 		}
 	
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index ac96a6dad..8db7400b2 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -2757,7 +2757,7 @@ class e_form
 			case 'number':
 				$maxlength = vartrue($parms['maxlength'], 255);
 				unset($parms['maxlength']);
-				if(!vartrue($parms['size'])) $parms['size'] = 15;
+				if(!vartrue($parms['size'])) $parms['size'] = 'mini';
 				if(!vartrue($parms['class'])) $parms['class'] = 'tbox number e-spinner';
 				if(!$value) $value = '0';
 				$ret =  vartrue($parms['pre']).$this->text($key, $value, $maxlength, $parms).vartrue($parms['post']);
diff --git a/e107_images/bbcode/fontsize.png b/e107_images/bbcode/fontsize.png
index eac1e23a0..34d8c719d 100644
Binary files a/e107_images/bbcode/fontsize.png and b/e107_images/bbcode/fontsize.png differ
diff --git a/e107_images/bbcode/table.png b/e107_images/bbcode/table.png
new file mode 100644
index 000000000..2174de3a0
Binary files /dev/null and b/e107_images/bbcode/table.png differ
diff --git a/e107_plugins/tinymce/e_meta.php b/e107_plugins/tinymce/e_meta.php
index 20cca8af9..b37711b4d 100644
--- a/e107_plugins/tinymce/e_meta.php
+++ b/e107_plugins/tinymce/e_meta.php
@@ -14,6 +14,10 @@
 
 if (!defined('e107_INIT')) { exit; }
 
+e107::css('inline','
+a.e-wysiwyg-toggle { margin-top:5px }
+');
+
 if(e_WYSIWYG || strpos(e_SELF,"tinymce/admin_config.php") )
 {
 	if(e_PAGE != 'image.php')
@@ -29,7 +33,7 @@ if(e_WYSIWYG || strpos(e_SELF,"tinymce/admin_config.php") )
 	if(ADMIN)
 	{
 	    $insert = "$('#'+id).after('<div>";
-	    $insert .= "<a href=\"#\" id=\"' + id + '\" class=\"e-wysiwyg-toggle btn btn-mini\">Switch to bbcode<\/a>";
+	    $insert .= "<a href=\"#\" id=\"' + id + '\" class=\"e-wysiwyg-toggle btn btn-inverse btn-mini\">Switch to bbcode<\/a>";
         
 	     if(e_PAGE == 'mailout.php')
         {
diff --git a/e107_themes/bootstrap/admin_style.css b/e107_themes/bootstrap/admin_style.css
index 2187bef44..7f94f34e2 100644
--- a/e107_themes/bootstrap/admin_style.css
+++ b/e107_themes/bootstrap/admin_style.css
@@ -94,6 +94,8 @@ a.brand:hover img 			{
 .sidebar-nav 								{ font-size:15px; }
 
 } 
+
+img.image-selector							{ margin-bottom:0px; }
       
 .nav-collapse 								{ margin-top:8px; }
 .dropdown-menu 								{ box-shadow: 0px 5px 10px rgba(0, 0, 0, 0.3); }
diff --git a/e107_themes/templates/bbcode_template.php b/e107_themes/templates/bbcode_template.php
index ec6f66eb6..c36a3d4e0 100644
--- a/e107_themes/templates/bbcode_template.php
+++ b/e107_themes/templates/bbcode_template.php
@@ -55,10 +55,12 @@ $BBCODE_TEMPLATE_SUBMITNEWS = "
 $BBCODE_TEMPLATE_ADMIN = "
 	{BB_HELP=admin}
 	<div class='field-spacer'><!-- --></div>
+	<div class='btn-group inline-text'>
 	{BB=link}{BB=b}{BB=i}{BB=u}{BB=img}{BB=format}{BB=justify}{BB=center}{BB=left}
 	{BB=right}{BB=bq}{BB=list}{BB=table}{BB=fontcol}{BB=fontsize}{BB=emotes}
 	{BB_PREIMAGEDIR}
 	{BB=preimage}{BB=prefile}{BB=flash}{BB=youtube}
+	</div>
 	<div class='field-spacer'><!-- --></div>
 ";
 
diff --git a/e107_web/js/core/all.jquery.css b/e107_web/js/core/all.jquery.css
index 9478053e4..79b0ae591 100644
--- a/e107_web/js/core/all.jquery.css
+++ b/e107_web/js/core/all.jquery.css
@@ -10,7 +10,7 @@ img.e-rate				{    }
 .e-rate-status			{ font-weight:bold;vertical-align:middle; padding-right:4px; width:140px; display:inline-block; text-align:right	}
 .e-rate-status-download { text-align:left; }
 .e-rate-votes			{ vertical-align:middle; display:inline-block; width:100px }
-select.e-bb				{ margin-top:4px; display:inline-block; vertical-align:top }
-.bbcode_buttons			{ border:1px solid transparent; background-color: #FFFFFF }
-.bbcode_buttons:hover	{ background-color: silver; border:1px solid black; }
+select.e-bb				{ margin-top:0px; width:100px }
+.bbcode_buttons			{  }
+.bbcode_buttons:hover	{  }