diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index 3858d7f7a..27496dfdb 100755
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -1206,7 +1206,7 @@ class plugin_online_ui extends e_admin_ui
 
 	//	$d = http_build_query($srcData,false,'&');
 	//	$url = e_SELF.'?mode=download&src='.base64_encode($d);
-		$dicon = '<a title="'.EPL_ADLAN_237.'" class="e-modal btn btn-default" href="'.$url.'" rel="external" data-loading="'.e_IMAGE.'/generic/loading_32.gif"  data-cache="false" data-modal-caption="'.$modalCaption.'"  target="_blank" >'.ADMIN_INSTALLPLUGIN_ICON.'</a>';
+		$dicon = '<a title="'.EPL_ADLAN_237.'" class="e-modal btn btn-default btn-secondary" href="'.$url.'" rel="external" data-loading="'.e_IMAGE.'/generic/loading_32.gif"  data-cache="false" data-modal-caption="'.$modalCaption.'"  target="_blank" >'.ADMIN_INSTALLPLUGIN_ICON.'</a>';
 
 		/*
 
diff --git a/e107_core/controllers/system/xup.php b/e107_core/controllers/system/xup.php
index 396f7bcb4..c4183cbf0 100644
--- a/e107_core/controllers/system/xup.php
+++ b/e107_core/controllers/system/xup.php
@@ -121,8 +121,8 @@ class core_system_xup_controller extends eController
 			if($var['enabled'] == 1)
 			{
 				echo '<h3>'.$key.'</h3><ul>';
-				echo '<li><a class="btn btn-default" href="'.e107::getUrl()->create('system/xup/login?provider='.$key.'&back='.base64_encode($testUrl)).'">'.e107::getParser()->lanVars(LAN_XUP_ERRM_09, array('x'=>$key)).'</a></li>';
-				echo '<li><a class="btn btn-default" href="'.e107::getUrl()->create('system/xup/signup?provider='.$key.'&back='.base64_encode($testUrl)).'">'.e107::getParser()->lanVars(LAN_XUP_ERRM_10, array('x'=>$key)).'</a></li>';		
+				echo '<li><a class="btn btn-default btn-secondary" href="'.e107::getUrl()->create('system/xup/login?provider='.$key.'&back='.base64_encode($testUrl)).'">'.e107::getParser()->lanVars(LAN_XUP_ERRM_09, array('x'=>$key)).'</a></li>';
+				echo '<li><a class="btn btn-default btn-secondary" href="'.e107::getUrl()->create('system/xup/signup?provider='.$key.'&back='.base64_encode($testUrl)).'">'.e107::getParser()->lanVars(LAN_XUP_ERRM_10, array('x'=>$key)).'</a></li>';
 			
 				echo "</ul>";
 			}
@@ -130,7 +130,7 @@ class core_system_xup_controller extends eController
 		//	print_a($var);
 		}
 		
-			echo '<br /><br /><a class="btn btn-default" href="'.e107::getUrl()->create('system/xup/test?lgt').'">'.LAN_XUP_ERRM_12.'</a>';
+			echo '<br /><br /><a class="btn btn-default btn-secondary" href="'.e107::getUrl()->create('system/xup/test?lgt').'">'.LAN_XUP_ERRM_12.'</a>';
 		
 		/*
 		echo '<h3>Facebook</h3>';
diff --git a/e107_core/shortcodes/batch/error_shortcodes.php b/e107_core/shortcodes/batch/error_shortcodes.php
index 7b3a3dcda..cc5ead1e8 100644
--- a/e107_core/shortcodes/batch/error_shortcodes.php
+++ b/e107_core/shortcodes/batch/error_shortcodes.php
@@ -74,7 +74,7 @@ class error_shortcodes extends e_shortcode
 		$icon = e107::getParser()->toGlyph('fa-search');
 		$url = e107::getUrl()->create('search');
 
-		return '<a href="' . $url . '" class="btn btn-default">' . $icon . ' ' . LAN_ERROR_22 . '</a>';
+		return '<a href="' . $url . '" class="btn btn-default btn-secondary">' . $icon . ' ' . LAN_ERROR_22 . '</a>';
 	}
 
 }
diff --git a/e107_core/templates/nextprev_template.php b/e107_core/templates/nextprev_template.php
index ee5c21770..2d8015e5e 100644
--- a/e107_core/templates/nextprev_template.php
+++ b/e107_core/templates/nextprev_template.php
@@ -100,7 +100,7 @@ $NEXTPREV_TEMPLATE['basic_nav_last'] 			= '';
 $NEXTPREV_TEMPLATE['basic_nav_next'] 			= '<a class="btn btn-default btn-secondary nextprev-item next " href="{url}" title="{url_label}" {disabled}><i class="fa fa-forward"></i></a>';
 $NEXTPREV_TEMPLATE['basic_items_start'] 		= '';
 $NEXTPREV_TEMPLATE['basic_item'] 				= ''; 
-$NEXTPREV_TEMPLATE['basic_item_current'] 		= '<a class="btn btn-default">{label}</a>';
+$NEXTPREV_TEMPLATE['basic_item_current'] 		= '<a class="btn btn-default btn-secondary">{label}</a>';
 $NEXTPREV_TEMPLATE['basic_items_end'] 			= '';
 $NEXTPREV_TEMPLATE['basic_separator'] 			= '';
 
diff --git a/e107_handlers/admin_ui.php b/e107_handlers/admin_ui.php
index f1414aa7f..25eefb1b8 100644
--- a/e107_handlers/admin_ui.php
+++ b/e107_handlers/admin_ui.php
@@ -6706,9 +6706,9 @@ class e_admin_form_ui extends e_form
 		if($this->_list_view === 'grid' && $this->getController()->getGrid('carousel') === true)
 		{
 			return '<div class="btn-group" >
-			<a id="admin-ui-carousel-prev" class="btn btn-default" href="#admin-ui-carousel" data-slide="prev"><i class="fa fa-backward"></i></a>
-			<a id="admin-ui-carousel-index" class="btn btn-default">1</a>
-			<a id="admin-ui-carousel-next" class="btn btn-default" href="#admin-ui-carousel" data-slide="next"><i class="fa fa-forward"></i></a>
+			<a id="admin-ui-carousel-prev" class="btn btn-default btn-secondary" href="#admin-ui-carousel" data-slide="prev"><i class="fa fa-backward"></i></a>
+			<a id="admin-ui-carousel-index" class="btn btn-default btn-secondary">1</a>
+			<a id="admin-ui-carousel-next" class="btn btn-default btn-secondary" href="#admin-ui-carousel" data-slide="next"><i class="fa fa-forward"></i></a>
 			</div>';
 		}
 
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index cdb87f10d..68cce32d5 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -4216,7 +4216,7 @@ class e_form
 			}
 
 			$query = http_build_query($query);
-			$value .= "<a href='".e_SELF."?{$query}' class='btn btn-default".$eModal."' ".$eModalCap." title='".LAN_EDIT."' data-toggle='tooltip' data-placement='left'>
+			$value .= "<a href='".e_SELF."?{$query}' class='btn btn-default btn-secondary".$eModal."' ".$eModalCap." title='".LAN_EDIT."' data-toggle='tooltip' data-placement='left'>
 				".$editIconDefault."</a>";
 		}
 
diff --git a/e107_plugins/download/download_shortcodes.php b/e107_plugins/download/download_shortcodes.php
index 054fd3e79..d8a6ea43d 100644
--- a/e107_plugins/download/download_shortcodes.php
+++ b/e107_plugins/download/download_shortcodes.php
@@ -1032,7 +1032,7 @@ class download_shortcodes extends e_shortcode
 			
 		$text .= '
               <span class="input-group-btn">
-              <button class="btn btn-default" type="submit" name="s"  value="1">';
+              <button class="btn btn-default btn-secondary" type="submit" name="s"  value="1">';
               
               $text .= $tp->toIcon('glyphicon-search.glyph');
 
diff --git a/e107_plugins/gallery/templates/gallery_template.php b/e107_plugins/gallery/templates/gallery_template.php
index 1ed010617..3e8cf44f5 100644
--- a/e107_plugins/gallery/templates/gallery_template.php
+++ b/e107_plugins/gallery/templates/gallery_template.php
@@ -29,7 +29,7 @@ $GALLERY_TEMPLATE['list']['end'] = '
 <div class="center">
 	<div class="gallery-list-nextprev">{GALLERY_NEXTPREV}</div>
 	<div class="gallery-list-back">
-		<a class="btn btn-default" href="{GALLERY_BASEURL}">' . LAN_BACK . '</a>
+		<a class="btn btn-default btn-secondary" href="{GALLERY_BASEURL}">' . LAN_BACK . '</a>
 	</div>
 </div>
 ';
@@ -69,7 +69,7 @@ $GALLERY_TEMPLATE['slideshow_wrapper'] = '
 	<a href="#" class="gallery-control gal-next btn btn-xs btn-default btn-secondary pull-right">
 		' . LAN_NEXT . ' {GLYPH=fa-chevron-right}
 	</a>
-	<a href="#" class="gallery-control gal-prev btn btn-xs btn-default">
+	<a href="#" class="gallery-control gal-prev btn btn-xs btn-default btn-secondary">
 		{GLYPH=fa-chevron-left} ' . LAN_PREVIOUS . '
 	</a>
 	<span class="gallery-slide-jumper-container">
diff --git a/e107_plugins/news/other_news_menu.php b/e107_plugins/news/other_news_menu.php
index d23eefd17..3983eca4d 100644
--- a/e107_plugins/news/other_news_menu.php
+++ b/e107_plugins/news/other_news_menu.php
@@ -57,8 +57,8 @@ if(!$OTHERNEWS_STYLE)
 		}
 		$template = e107::getTemplate('news', 'news_menu', 'other');
 		
-		$item_selector = '<div class="btn-group pull-right"><a class="btn btn-mini btn-xs btn-default" href="#otherNews" data-slide="prev">‹</a>  
- 		<a class="btn btn-mini btn-xs btn-default" href="#otherNews" data-slide="next">›</a></div>';
+		$item_selector = '<div class="btn-group pull-right"><a class="btn btn-mini btn-xs btn-default btn-secondary" href="#otherNews" data-slide="prev">‹</a>  
+ 		<a class="btn btn-mini btn-xs btn-default btn-secondary" href="#otherNews" data-slide="next">›</a></div>';
 
 		if(!empty($parms['caption']))
 		{
diff --git a/e107_plugins/search_menu/search_menu.php b/e107_plugins/search_menu/search_menu.php
index 7398bb6d0..1e49d39a0 100644
--- a/e107_plugins/search_menu/search_menu.php
+++ b/e107_plugins/search_menu/search_menu.php
@@ -78,7 +78,7 @@ if(deftrue('BOOTSTRAP'))
 		
 	$text .= '
          <span class="input-group-btn">
-         <button class="btn btn-default" type="submit" name="s">'.$tp->toGlyph('search').'</button>
+         <button class="btn btn-default btn-secondary" type="submit" name="s">'.$tp->toGlyph('search').'</button>
          </span>
     </div>
     </form>';
diff --git a/e107_themes/landingzero/templates/featurebox/featurebox_template.php b/e107_themes/landingzero/templates/featurebox/featurebox_template.php
index af4c63bf2..97391ac40 100644
--- a/e107_themes/landingzero/templates/featurebox/featurebox_template.php
+++ b/e107_themes/landingzero/templates/featurebox/featurebox_template.php
@@ -43,7 +43,7 @@ $FEATUREBOX_TEMPLATE['landingzero_homepage_modal'] = '{SETIMAGE: w=900&h=650&cro
                             <hr class="star-primary">
                             {FEATUREBOX_IMAGE}
                             {FEATUREBOX_TEXT}
-                            <button type="button" class="btn btn-default" data-dismiss="modal"><i class="fa fa-times"></i> ' . LAN_CLOSE . '</button>
+                            <button type="button" class="btn btn-default btn-secondary" data-dismiss="modal"><i class="fa fa-times"></i> ' . LAN_CLOSE . '</button>
                         </div>
                     </div>
                 </div>
diff --git a/e107_themes/landingzero/templates/gallery/gallery_template.php b/e107_themes/landingzero/templates/gallery/gallery_template.php
index d1bf4dead..4827d7892 100644
--- a/e107_themes/landingzero/templates/gallery/gallery_template.php
+++ b/e107_themes/landingzero/templates/gallery/gallery_template.php
@@ -27,7 +27,7 @@ $GALLERY_TEMPLATE['slideshow_wrapper'] = '
 	<a href="#" class="gallery-control gal-next btn btn-xs btn-default btn-secondary pull-right">
 		' . LAN_NEXT . ' {GLYPH=fa-chevron-right}
 	</a>
-	<a href="#" class="gallery-control gal-prev btn btn-xs btn-default">
+	<a href="#" class="gallery-control gal-prev btn btn-xs btn-default btn-secondary">
 		{GLYPH=fa-chevron-left} ' . LAN_PREVIOUS . '
 	</a>
 	<span class="gallery-slide-jumper-container">