diff --git a/e107_admin/frontpage.php b/e107_admin/frontpage.php
index fb1bf4e50..5092bc1c0 100644
--- a/e107_admin/frontpage.php
+++ b/e107_admin/frontpage.php
@@ -422,7 +422,7 @@ class frontpage
 					//		".$frm->admin_button('fp_dec',$order,'down',ADMIN_DOWN_ICON)."
 
 						$text .= "
-							<a class='btn' title='".LAN_EDIT."' href='".e_SELF."?id=".$order."' >".ADMIN_EDIT_ICON."</a>
+							<a class='btn btn-default' title='".LAN_EDIT."' href='".e_SELF."?id=".$order."' >".ADMIN_EDIT_ICON."</a>
 							".$frm->admin_button('fp_delete_rule['.$order.']',$order,'',ADMIN_DELETE_ICON)."					
 						</div>
 						</td>
diff --git a/e107_admin/links.php b/e107_admin/links.php
index 295aeec12..aa7e2b268 100644
--- a/e107_admin/links.php
+++ b/e107_admin/links.php
@@ -55,7 +55,7 @@ class links_admin extends e_admin_dispatcher
 		'main/edit'	=> 'main/list'
 	);
 
-	protected $menuTitle = 'links';
+	protected $menuTitle = 'Links';
 }
 
 class links_admin_ui extends e_admin_ui
diff --git a/e107_admin/search.php b/e107_admin/search.php
index ab67f79da..2d83ae924 100644
--- a/e107_admin/search.php
+++ b/e107_admin/search.php
@@ -396,7 +396,7 @@ else
 								</select>
 							</td>
 							<td class='center'>
-								<a class='btn btn-large' href='".e_SELF."?edit.c.".$key."'>".ADMIN_EDIT_ICON."</a>
+								<a class='btn btn-default btn-large' href='".e_SELF."?edit.c.".$key."'>".ADMIN_EDIT_ICON."</a>
 							</td>
 						</tr>
 		";
@@ -450,7 +450,7 @@ else
 								</select>
 							</td>
 							<td class='center'>
-								<a class='btn btn-large' href='".e_SELF."?edit.p.".$plug_dir."'>".ADMIN_EDIT_ICON."</a>
+								<a class='btn btn-default btn-large' href='".e_SELF."?edit.p.".$plug_dir."'>".ADMIN_EDIT_ICON."</a>
 							</td>
 						</tr>
 		";
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index eb6f83d9c..8a9a00724 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -554,7 +554,12 @@ class e_form
 		if(!vartrue($options['size'])) $options['size'] = 15;
 		if(!vartrue($options['class'])) $options['class'] = 'tbox number e-spinner input-small form-control';
 		
-		
+		if(!empty($options['size']))
+		{
+			$options['class'] .= 'input-'.$options['size'];
+			unset($options['size']);
+		}
+
 		$options['type'] ='number';
 		
 		$mlength = vartrue($maxlength) ? "maxlength=".$maxlength : "";
@@ -886,7 +891,7 @@ class e_form
 			$thpath = isset($sc_parameters['nothumb']) || vartrue($hide) ? $default : $tp->thumbUrl($default_thumb, $att, true);
 			
 			
-			$label = "<img id='{$name_id}_prev' src='{$default_url}' alt='{$default_url}' class='well well-small image-selector' style='display:block;' />";
+			$label = "<img id='{$name_id}_prev' src='{$default_url}' alt='{$default_url}' class='well well-small image-selector img-responsive' style='display:block;' />";
 			
 			if($cat != 'news' && $cat !='page' && $cat !='') 
 			{
@@ -2243,6 +2248,7 @@ class e_form
 			break;
 	
 			case 'cancel':
+				$options['class'] .= 'btn-default';
 				// use this for neutral colors. 
 			break;
 
@@ -2654,6 +2660,7 @@ class e_form
 		{
 			if ((in_array($key, $columnPref) || $key=='options' || vartrue($val['forced'])) && !vartrue($val['nolist']))
 			{
+
 				$class = vartrue($val['class']) ? 'class="'.$val['class'].'"' : '';
 				$width = vartrue($val['width']) ? ' style="width:'.$val['width'].'"' : '';
 				$text .= '<col '.$class.$width.' />
diff --git a/e107_themes/bootstrap3/admin_style.css b/e107_themes/bootstrap3/admin_style.css
index d8f0d9918..3b912cac3 100644
--- a/e107_themes/bootstrap3/admin_style.css
+++ b/e107_themes/bootstrap3/admin_style.css
@@ -44,11 +44,42 @@ body						{ padding-top: 75px;  }
 .tab-border 				{ border-left: 1px solid #ddd; }
 .tab-content 				{ overflow: visible }
 
-.core-mainpanel-block 		{ text-align:center; width:140px; float:left; height:80px; display:block; padding:1px; margin: 0px 2px 15px 2px;  }
+.core-mainpanel-block 		{ text-align:center; width:140px; float:left; height:100px; display:block; padding:1px; margin: 0;  }
 .core-mainpanel-link-text 	{ text-decoration: none; display:block;  }
-a.core-mainpanel-link-icon	{ height:80px; width: 120px; padding-top:20px;  }
+a.core-mainpanel-link-icon	{ height:100px; width: 141px; padding-top:20px;  }
 a.core-mainpanel-link-icon:hover { text-decoration: none; filter: none; }
 
+table input.form-control, table textarea.form-control,  table select.form-control {
+    width: 206px;
+}
+
+/* Bootstrap 2 styling  //TODO disable when using a mobile device */
+.input-mini, .form-control.input-mini {
+    width:60px
+}
+
+.input-small, .form-control.input-small {
+    width:90px
+}
+
+.input-medium, .form-control.input-medium {
+    width:150px
+}
+
+.input-large, .form-control.input-large {
+    width:210px
+}
+
+.input-xlarge, .form-control.input-xlarge {
+    width:270px
+}
+
+.input-xxlarge, .form-control.input-xxlarge {
+    width:530px
+}
+
+table textarea.input-block-level, input.input-block-level, select.input-block-level { width: 100% }
+
 
 
 #admin-ui-list-batch                { padding-left:15px; padding-top:8px; }
@@ -63,6 +94,8 @@ a.core-mainpanel-link-icon:hover { text-decoration: none; filter: none; }
 #admin-ui-edit                      { }
 #admin-ui-edit-db-language          { margin-bottom: -30px; margin-top:-10px; padding-bottom:5px; padding-right:5px }
 
+td.options .btn-group        {  display: flex; }
+
 .table .nav-tabs a, .table th a, .table td a    { text-decoration: none }
 
 .label, .badge {
@@ -877,17 +910,17 @@ ul#e-latest li  a:hover  		{ text-decoration: none; }
 
 .tag {
 	margin-right:5px;
-	display: inline-block;
+
   	float: none;
   	margin-left: 0;
-  	vertical-align:top;
-  	margin-top:3px;
+    padding:7px;
   	
 }
 
 span.tag button.close {
 	float: none;
 	padding-left:5px;
+    vertical-align: middle;
 }
 
 /* Theme Manager - Find online */
diff --git a/e107_themes/bootstrap3/css/bootstrap_dark.css b/e107_themes/bootstrap3/css/bootstrap_dark.css
index 027919586..f2b6cb46b 100644
--- a/e107_themes/bootstrap3/css/bootstrap_dark.css
+++ b/e107_themes/bootstrap3/css/bootstrap_dark.css
@@ -1088,13 +1088,13 @@ textarea {
   line-height: inherit;
 }
 a {
-  color: #ffffff;
+  color: #4f93ce;
   text-decoration: none;
 }
 a:hover,
 a:focus {
   color: #ffffff;
-  text-decoration: underline;
+  text-decoration: none;
 }
 a:focus {
   outline: thin dotted;
@@ -3440,7 +3440,7 @@ fieldset[disabled] .btn-danger.active {
   background-color: #ffffff;
 }
 .btn-link {
-  color: #ffffff;
+  color: #4f93ce;
   font-weight: normal;
   border-radius: 0;
 }
@@ -3462,7 +3462,7 @@ fieldset[disabled] .btn-link {
 .btn-link:hover,
 .btn-link:focus {
   color: #ffffff;
-  text-decoration: underline;
+  text-decoration: none;
   background-color: transparent;
 }
 .btn-link[disabled]:hover,
@@ -4036,7 +4036,7 @@ select[multiple].input-group-sm > .input-group-btn > .btn {
 .nav .open > a:hover,
 .nav .open > a:focus {
   background-color: #494949;
-  border-color: #ffffff;
+  border-color: #4f93ce;
 }
 .nav .nav-divider {
   height: 1px;
@@ -4753,7 +4753,7 @@ fieldset[disabled] .navbar-inverse .btn-link:focus {
   padding: 8px 12px;
   line-height: 1.42857143;
   text-decoration: none;
-  color: #ffffff;
+  color: #4f93ce;
   background-color: #212121;
   border: 1px solid rgba(0, 0, 0, 0.6);
   margin-left: -1px;
@@ -4949,7 +4949,7 @@ a.label:focus {
   vertical-align: middle;
   white-space: nowrap;
   text-align: center;
-  background-color: #c6c6c6;
+  background-color: #555555;
   border-radius: 10px;
 }
 .badge:empty {
@@ -4972,8 +4972,8 @@ a.badge:focus {
 }
 .list-group-item.active > .badge,
 .nav-pills > .active > a > .badge {
-  color: #ffffff;
-  background-color: #c6c6c6;
+  color: #4f93ce;
+  background-color: #555555;
 }
 .list-group-item > .badge {
   float: right;
@@ -5045,7 +5045,7 @@ a.badge:focus {
 a.thumbnail:hover,
 a.thumbnail:focus,
 a.thumbnail.active {
-  border-color: #ffffff;
+  border-color: #4f93ce;
 }
 .thumbnail .caption {
   padding: 9px;
@@ -6007,7 +6007,7 @@ button.close {
 }
 .tooltip {
   position: absolute;
-  z-index: 1030;
+  z-index: 1070;
   display: block;
   font-family: "Helvetica Neue", Helvetica, Arial, sans-serif;
   font-style: normal;
@@ -6123,7 +6123,7 @@ button.close {
   position: absolute;
   top: 0;
   left: 0;
-  z-index: 1010;
+  z-index: 1060;
   display: none;
   max-width: 276px;
   padding: 1px;
@@ -6992,7 +6992,6 @@ select {
   border-radius: 4px;
   box-shadow: 0px 1px 1px rgba(0, 0, 0, 0.075) inset;
   transition: border-color 0.15s ease-in-out 0s, box-shadow 0.15s ease-in-out 0s;
-  height: 38px;
   padding: 8px 12px;
   font-size: 14px;
 }
diff --git a/e107_web/js/bootstrap-tag/bootstrap-tag.js b/e107_web/js/bootstrap-tag/bootstrap-tag.js
index a9f8fbac7..560ef35b4 100644
--- a/e107_web/js/bootstrap-tag/bootstrap-tag.js
+++ b/e107_web/js/bootstrap-tag/bootstrap-tag.js
@@ -111,7 +111,7 @@
   , createBadge: function ( value ) {
     var that = this
     
-    $('<span class="tag label label-info ">')
+    $('<span class="tag label label-primary ">')
       .text(value)
       .append($('<button type="button" class="close">&times;</button>')
         .on('click', function () {