diff --git a/e107_admin/banlist.php b/e107_admin/banlist.php
index 5359f97e4..f8e166a47 100644
--- a/e107_admin/banlist.php
+++ b/e107_admin/banlist.php
@@ -557,7 +557,7 @@ switch ($action)
 				$text .= "<tr><td colspan='5' style='text-align:center'><br />".$tp->parseTemplate("{NEXTPREV={$parms}}".'<br /><br /></td></tr>');
 			}
 			$text .= "<tr><td colspan='4' style='text-align:center'>
-						<input class='button' type='submit' name='delete_ban_log' value='".BANLAN_88."' />
+						<input class='btn button' type='submit' name='delete_ban_log' value='".BANLAN_88."' />
 						<input type='hidden' name='e-token' value='".e_TOKEN."' />
 					</td>
 					  </tr>";
diff --git a/e107_admin/message.php b/e107_admin/message.php
index ab375de8f..50debf9fa 100644
--- a/e107_admin/message.php
+++ b/e107_admin/message.php
@@ -83,13 +83,13 @@ if($amount = $sql -> db_Select("generic", "*", $queryString))
 <b>".MESSLAN_9."</b>: ".$gen->convert_date($gen_datestamp, 'long')."<br />
 <b>".MESSLAN_10."</b>: $user<br />
 <b>".MESSLAN_13."</b>: $link ";
-($gen_chardata ? "<br /><b>".MESSLAN_12."</b>: $gen_chardata" : "")."<br /><input class='button' type='submit' name='delete_message' value='".MESSLAN_2." $gen_id' />
+($gen_chardata ? "<br /><b>".MESSLAN_12."</b>: $gen_chardata" : "")."<br /><input class='btn button' type='submit' name='delete_message' value='".MESSLAN_2." $gen_id' />
 </td>\n</tr>\n";
 	}
 
 $text .= "
 <tr>
-<td><br /><input class='button' type='submit' name='delete_all' value='".MESSLAN_4."' />
+<td><br /><input class='btn button' type='submit' name='delete_all' value='".MESSLAN_4."' />
 <input type='checkbox' name='deleteconfirm' value='1' /> ".MESSLAN_5."
 </td>
 </tr>
diff --git a/e107_admin/modcomment.php b/e107_admin/modcomment.php
index 6aa517660..b7e9c0193 100644
--- a/e107_admin/modcomment.php
+++ b/e107_admin/modcomment.php
@@ -95,7 +95,7 @@ if ($editid)
 	{
 		$row = $sql->db_Fetch();
 		$text .= "<tr><td><textarea class='tbox' name='comment_comment' cols='1' rows='15' style='width:100%;'>".$row['comment_comment']."</textarea></td></tr>";
-		$text .= "<tr><td colspan='5' class='forumheader' style='text-align:center'><input class='button' type='submit' name='moderate' value='".MDCLAN_8."' /></td></tr>";
+		$text .= "<tr><td colspan='5' class='forumheader' style='text-align:center'><input class='btn button' type='submit' name='moderate' value='".MDCLAN_8."' /></td></tr>";
 		$text .= "<div><input type='hidden' name='e-token' value='".e_TOKEN."' /></div>";		
 	}
 
@@ -160,7 +160,7 @@ else
 	".$comments."
 	<tr><td colspan='5' class='forumheader' style='text-align:center'>".MDCLAN_9."</td></tr>
 	<tr><td colspan='5' class='forumheader' style='text-align:center'>
-	<input class='button' type='submit' name='moderate' value='".MDCLAN_8."' />
+	<input class='btn button' type='submit' name='moderate' value='".MDCLAN_8."' />
 	</td></tr>
 	";
 }
diff --git a/e107_admin/plugin.php b/e107_admin/plugin.php
index 1d7dc96ef..eaa881286 100644
--- a/e107_admin/plugin.php
+++ b/e107_admin/plugin.php
@@ -1015,7 +1015,7 @@ class pluginManager{
                              //   $text .= ($plug['plugin_installflag'] ? "<button type='button' class='delete' value='no-value' onclick=\"location.href='".e_SELF."?uninstall.{$plug['plugin_id']}'\"><span>".EPL_ADLAN_1."</span></button>" : "<button type='button' class='update' value='no-value' onclick=\"location.href='".e_SELF."?install.{$plug['plugin_id']}'\"><span>".EPL_ADLAN_0."</span></button>");
 								if (PLUGIN_SHOW_REFRESH && !varsettrue($plug_vars['plugin_php']))
 								{
-									$text .= "<br /><br /><input type='button' class='button' onclick=\"location.href='".e_SELF."?refresh.{$plug['plugin_id']}'\" title='".'Refresh plugin settings'."' value='".'Refresh plugin settings'."' /> ";
+									$text .= "<br /><br /><input type='button' class='btn button' onclick=\"location.href='".e_SELF."?refresh.{$plug['plugin_id']}'\" title='".'Refresh plugin settings'."' value='".'Refresh plugin settings'."' /> ";
 								}
 							}
 							else
diff --git a/e107_admin/upload.php b/e107_admin/upload.php
index 8511d0fda..011275625 100644
--- a/e107_admin/upload.php
+++ b/e107_admin/upload.php
@@ -424,7 +424,7 @@ switch ($action)
 	$text .= "
 	  <tr>
 		<td class='forumheader3' style='text-align:center' colspan='4'>
-				<input class='button' type='submit' name='generate_filetypes_xml' value='".UPLLAN_56."' />
+				<input class='btn button' type='submit' name='generate_filetypes_xml' value='".UPLLAN_56."' />
 		</td>
 	  </tr>
 	</table></form>
diff --git a/e107_admin/userclass2.php b/e107_admin/userclass2.php
index 03cb3436d..9c970886f 100644
--- a/e107_admin/userclass2.php
+++ b/e107_admin/userclass2.php
@@ -818,12 +818,12 @@ $ns->tablerender(UCSLAN_21, $text);
 		<table class='table adminform'>
 		<tr><td class='fcaption' style='text-align:center' colspan='2'>Test Functions and Information</td></tr>";
 	$text .= "<tr><td style='text-align:center' colspan='2'>DB Status: ".$db_status."</td></tr>";
-	$text .= "<tr><td><input class='button' type='submit' name='add_db_fields' value='Add new DB fields' />First required step</td>";
-	$text .= "<td><input class='button' type='submit' name='remove_db_fields' value='Remove new DB fields' />Reverse the process</td></tr>";
-	$text .= "<tr><td><input class='button' type='submit' name='add_class_tree' value='Add class tree' />Optional default tree</td>";
-	$text .= "<td><input class='button' type='submit' name='remove_class_tree' value='Remove class tree' />Deletes the 'core' class entries</td></tr>";
-	$text .= "<tr><td><input class='button' type='submit' name='rebuild_tree' value='Rebuild class tree' />Sets up all the structures</td>";
-	$text .= "<td><input class='button' type='submit' name='' value='Spare' />Spare</td></tr>";
+	$text .= "<tr><td><input class='btn button' type='submit' name='add_db_fields' value='Add new DB fields' />First required step</td>";
+	$text .= "<td><input class='btn button' type='submit' name='remove_db_fields' value='Remove new DB fields' />Reverse the process</td></tr>";
+	$text .= "<tr><td><input class='btn button' type='submit' name='add_class_tree' value='Add class tree' />Optional default tree</td>";
+	$text .= "<td><input class='btn button' type='submit' name='remove_class_tree' value='Remove class tree' />Deletes the 'core' class entries</td></tr>";
+	$text .= "<tr><td><input class='btn button' type='submit' name='rebuild_tree' value='Rebuild class tree' />Sets up all the structures</td>";
+	$text .= "<td><input class='btn button' type='submit' name='' value='Spare' />Spare</td></tr>";
 	$text .= "<tr><td colspan='2'>&nbsp;</td></tr>";
 	$text .= "<tr><td colspan='2'>".$e_userclass->show_tree(TRUE)."</td></tr>";
 
@@ -868,7 +868,7 @@ $ns->tablerender(UCSLAN_21, $text);
   $text = "Single class: ".$_POST['class_select']."<br />
        Multi-select: ".implode(',',$_POST['multi_class_select'])."<br />
        Check boxes: ".implode(',',$_POST['classes_select'])."<br />";
-  $text .= "<input class='button' type='submit' value='Click to save' />
+  $text .= "<input class='btn button' type='submit' value='Click to save' />
 	</form>	</div>";
   $ns->tablerender('Click on the button - the settings above should be remembered, and the $_POST values displayed', $text);
     break;				// End of 'debug'
diff --git a/e107_admin/users.php b/e107_admin/users.php
index bf8c8a2d3..69751062d 100644
--- a/e107_admin/users.php
+++ b/e107_admin/users.php
@@ -1798,10 +1798,10 @@ class users_admin_ui extends e_admin_ui
 		{
 		// Option to delete emails - only if there are some in the list
 			$text .= "</table><table style='".ADMIN_WIDTH."'><tr>
-			<td style='text-align: center;'><input class='button' type='submit' name='delnonbouncesubmit' value='".USRLAN_183."' /></td>\n
-			<td style='text-align: center;'><input class='button' type='submit' name='clearemailbouncesubmit' value='".USRLAN_184."' /></td>\n
-			<td style='text-align: center;'><input class='button' type='submit' name='delcheckedsubmit' value='".USRLAN_179."' /></td>\n
-			<td style='text-align: center;'><input class='button' type='submit' name='delallsubmit' value='".USRLAN_180."' /></td>\n
+			<td style='text-align: center;'><input class='btn button' type='submit' name='delnonbouncesubmit' value='".USRLAN_183."' /></td>\n
+			<td style='text-align: center;'><input class='btn button' type='submit' name='clearemailbouncesubmit' value='".USRLAN_184."' /></td>\n
+			<td style='text-align: center;'><input class='btn button' type='submit' name='delcheckedsubmit' value='".USRLAN_179."' /></td>\n
+			<td style='text-align: center;'><input class='btn button' type='submit' name='delallsubmit' value='".USRLAN_180."' /></td>\n
 			</td></tr>";
 		}
 		$text .= "</table></form></div>";
diff --git a/e107_core/shortcodes/batch/admin_shortcodes.php b/e107_core/shortcodes/batch/admin_shortcodes.php
index e2d322e62..703093032 100644
--- a/e107_core/shortcodes/batch/admin_shortcodes.php
+++ b/e107_core/shortcodes/batch/admin_shortcodes.php
@@ -222,7 +222,7 @@ class admin_shortcodes
 		{
 			$text .= $sql->mySQLlanguage;
 			$text .= " (".$slng->convert($sql->mySQLlanguage).")
-			: <span class='button' style='cursor: pointer;' onclick='expandit(\"lan_tables\");'><a style='text-decoration:none' title='' href=\"javascript:void(0);\" >&nbsp;&nbsp;".count($aff)." ".UTHEME_MENU_L3."&nbsp;&nbsp;</a></span><br />
+			: <span class='btn button' style='cursor: pointer;' onclick='expandit(\"lan_tables\");'><a style='text-decoration:none' title='' href=\"javascript:void(0);\" >&nbsp;&nbsp;".count($aff)." ".UTHEME_MENU_L3."&nbsp;&nbsp;</a></span><br />
 			<span style='display:none' id='lan_tables'>
 			";
 			$text .= implode('<br />', $aff);
@@ -811,13 +811,13 @@ class admin_shortcodes
 					<div style='text-align:center'>";
 					if(!$sql->db_Count('preset', '(*)', " WHERE preset_name='".$tp->toDB($existing, true)."'  "))
 					{
-						$pst_text .= "<input type='button' class='button' name='save_preset' value='".LAN_SAVE."' onclick=\"$trigger savepreset('".$theform."',$pid)\" />";
+						$pst_text .= "<input type='button' class='btn button' name='save_preset' value='".LAN_SAVE."' onclick=\"$trigger savepreset('".$theform."',$pid)\" />";
 					}
 					else
 					{
-						$pst_text .= "<input type='button' class='button' name='save_preset' value='".LAN_UPDATE."' onclick=\"$trigger savepreset('".$theform."',$pid)\" />";
+						$pst_text .= "<input type='button' class='btn button' name='save_preset' value='".LAN_UPDATE."' onclick=\"$trigger savepreset('".$theform."',$pid)\" />";
 						$pst_text .= "<input type='hidden' name='del_id' value='$pid' />
-						<input type='submit' class='button' name='delete_preset' value='".LAN_DELETE."' onclick=\"return jsconfirm('".$tp->toJS(LAN_PRESET_CONFIRMDEL." [".$existing."]")."')\" />";
+						<input type='submit' class='btn button' name='delete_preset' value='".LAN_DELETE."' onclick=\"return jsconfirm('".$tp->toJS(LAN_PRESET_CONFIRMDEL." [".$existing."]")."')\" />";
 					}
 					$pst_text .= "</div></form>";
 					return $ns->tablerender(LAN_PRESET, $pst_text, '', true);
diff --git a/e107_core/shortcodes/batch/contact_shortcodes.php b/e107_core/shortcodes/batch/contact_shortcodes.php
index 445301f50..06b6ff3dd 100644
--- a/e107_core/shortcodes/batch/contact_shortcodes.php
+++ b/e107_core/shortcodes/batch/contact_shortcodes.php
@@ -117,7 +117,7 @@ class contact_shortcodes extends e_shortcode
 	
 	function sc_contact_submit_button($parm='')
 	{
-		return "<input type='submit' name='send-contactus' value=\"".LANCONTACT_08."\" class='button' />";	
+		return "<input type='submit' name='send-contactus' value=\"".LANCONTACT_08."\" class='btn button' />";	
 	}
 
 }
diff --git a/e107_core/shortcodes/batch/signup_shortcodes.php b/e107_core/shortcodes/batch/signup_shortcodes.php
index d9eec8d77..c3cca68d2 100755
--- a/e107_core/shortcodes/batch/signup_shortcodes.php
+++ b/e107_core/shortcodes/batch/signup_shortcodes.php
@@ -35,7 +35,7 @@ class signup_shortcodes extends e_shortcode
 		<input type='radio' name='coppa' value='0' checked='checked' /> ".LAN_NO."
 		<input type='radio' name='coppa' value='1' /> ".LAN_YES."<br />
 		<br />
-		<input class='button' type='submit' name='newver' value=\"".LAN_CONTINUE."\" />
+		<input class='btn button' type='submit' name='newver' value=\"".LAN_CONTINUE."\" />
 		</div></form>
 		";
 		}
diff --git a/e107_core/shortcodes/batch/user_shortcodes.php b/e107_core/shortcodes/batch/user_shortcodes.php
index 45ce71051..0601ee34e 100644
--- a/e107_core/shortcodes/batch/user_shortcodes.php
+++ b/e107_core/shortcodes/batch/user_shortcodes.php
@@ -497,7 +497,7 @@ class user_shortcodes extends e_shortcode
 		{
 			return "
 			<form method='post' action='".e_SELF."?".e_QUERY."'>
-			<input class='button' type='submit' name='delp' value='".LAN_USER_43."' />
+			<input class='btn button' type='submit' name='delp' value='".LAN_USER_43."' />
 			</form>
 			";
 		}
@@ -646,7 +646,7 @@ class user_shortcodes extends e_shortcode
 	
 	function sc_user_form_submit($parm) 
 	{
-		return "<input class='button' type='submit' name='submit' value='".LAN_USER_47."' />";
+		return "<input class='btn button' type='submit' name='submit' value='".LAN_USER_47."' />";
 	}
 
 
diff --git a/e107_core/shortcodes/single/custom.php b/e107_core/shortcodes/single/custom.php
index 487d9d51e..fe5df59be 100644
--- a/e107_core/shortcodes/single/custom.php
+++ b/e107_core/shortcodes/single/custom.php
@@ -26,7 +26,7 @@ function custom_shortcode($parm)
 			{
 				$ret .= "<form method='post' action='".e_SELF.(e_QUERY ? '?'.e_QUERY : '')."'>\n<div class='loginc_div'>\n".LOGIN_MENU_L1."<input class='tbox loginc user' type='text' name='username' size='15' value='$username' maxlength='20' />&nbsp;&nbsp;\n".LOGIN_MENU_L2."<input class='tbox loginc pass' type='password' name='userpass' size='15' value='' maxlength='20' />&nbsp;&nbsp;\n";
 				$ret .= ($pref['user_tracking'] == "cookie") ? "<input type='checkbox' name='autologin' value='1' />".LOGIN_MENU_L6."&nbsp;&nbsp;\n" : "";
-				$ret .= "<input class='button loginc' type='submit' name='userlogin' value='".LOGIN_MENU_L28."' />";
+				$ret .= "<input class='btn button loginc' type='submit' name='userlogin' value='".LOGIN_MENU_L28."' />";
 				if($pref['user_reg'])
 				{
 					$ret .= "&nbsp;&nbsp;<a class='loginc signup' href='".e_SIGNUP."'>".LOGIN_MENU_L3."</a>";
diff --git a/e107_handlers/form_handler.php b/e107_handlers/form_handler.php
index c0251be50..24f3cdcdb 100644
--- a/e107_handlers/form_handler.php
+++ b/e107_handlers/form_handler.php
@@ -376,7 +376,7 @@ class e_form
 		{			
 			$text = "<input class='tbox' style='width:80%' id='{$idinput}' type='text' name='image' size='40' value='$curVal' maxlength='100' title=\"".LAN_SIGNUP_111."\" />";
 			$text .= "<img src='".$img."' id='{$previnput}' style='display:none' />";
-			$text .= "<input class='button e-expandit' type ='button' style='cursor:pointer' size='30' value=\"Choose Avatar\"  />"; //TODO Common LAN. 
+			$text .= "<input class='btn button e-expandit' type ='button' style='cursor:pointer' size='30' value=\"Choose Avatar\"  />"; //TODO Common LAN. 
 		}
 						
 		$avFiles = e107::getFile()->get_files(e_MEDIA."avatars/",".jpg|.png|.gif|.jpeg|.JPG|.GIF|.PNG");
@@ -3237,7 +3237,7 @@ class form
 		$name = ($form_name ? " id='".$form_name."' name='".$form_name."'" : "");
 		$image = ($form_image ? " src='".$form_image."' " : "");
 		$tooltip = ($form_tooltip ? " title='".$form_tooltip."' " : "");
-		return "\n<input class='button' type='".$form_type."' ".$form_js." value='".$form_value."'".$name.$image.$tooltip." />";
+		return "\n<input class='btn button' type='".$form_type."' ".$form_js." value='".$form_value."'".$name.$image.$tooltip." />";
 	}
 
 	function form_textarea($form_name, $form_columns, $form_rows, $form_value, $form_js = "", $form_style = "", $form_wrap = "", $form_readonly = "", $form_tooltip = "") {
diff --git a/e107_handlers/mailout_admin_class.php b/e107_handlers/mailout_admin_class.php
index fb3f8137f..8ec3d29e8 100644
--- a/e107_handlers/mailout_admin_class.php
+++ b/e107_handlers/mailout_admin_class.php
@@ -1044,8 +1044,8 @@ class mailoutAdminClass extends e107MailManager
 		$text .= "</tbody></table>\n</fieldset>";
 
 		$text .= "<div class='buttons-bar center'>
-			<input class='button' type='submit' name='email_delete' value=\"".LAN_DELETE."\" />
-			&nbsp;<input class='button' type='submit' name='email_cancel' value=\"".LAN_CANCEL."\" />
+			<input class='btn button' type='submit' name='email_delete' value=\"".LAN_DELETE."\" />
+			&nbsp;<input class='btn button' type='submit' name='email_cancel' value=\"".LAN_CANCEL."\" />
 		</div>";
 
 		$text .= "</form></div>";
diff --git a/e107_handlers/menumanager_class.php b/e107_handlers/menumanager_class.php
index a2adc883a..51f7acdea 100644
--- a/e107_handlers/menumanager_class.php
+++ b/e107_handlers/menumanager_class.php
@@ -861,7 +861,7 @@ class e_menuManager {
 		$text .= "</td><td style='width:50%;vertical-align:top;text-align:center'><br />";
 		foreach ($this->menu_areas as $menu_act)
 		{
-			$text .= "<input type='submit' class='button' id='menuActivate_".trim($menu_act)."' name='menuActivate[".trim($menu_act)."]' value='".MENLAN_13." ".trim($menu_act)."' /><br /><br />\n";
+			$text .= "<input type='submit' class='btn button' id='menuActivate_".trim($menu_act)."' name='menuActivate[".trim($menu_act)."]' value='".MENLAN_13." ".trim($menu_act)."' /><br /><br />\n";
 		}
 
 
@@ -869,7 +869,7 @@ class e_menuManager {
 		{
 			if(isset($pref['sitetheme_layouts'][$layout]['menuPresets']))
 			{
-		    	$text .= "<input type='submit' class='button' name='menuUsePreset' value=\"".MENLAN_40."\" onclick=\"return jsconfirm('".$tp->toJS(MENLAN_41)."')\" /><br /><br />\n";  // Use Menu Presets
+		    	$text .= "<input type='submit' class='btn button' name='menuUsePreset' value=\"".MENLAN_40."\" onclick=\"return jsconfirm('".$tp->toJS(MENLAN_41)."')\" /><br /><br />\n";  // Use Menu Presets
 				$text .= "<input type='hidden' name='menuPreset' value='".$layout."' />";
 			}
 			$text .= "<input type='hidden'  name='curLayout' value='".$layout."' />";
diff --git a/e107_handlers/phpmailer/mailout_process.php b/e107_handlers/phpmailer/mailout_process.php
index 722399877..9fbc46c12 100644
--- a/e107_handlers/phpmailer/mailout_process.php
+++ b/e107_handlers/phpmailer/mailout_process.php
@@ -51,7 +51,7 @@ if($_POST['cancel_emails'])
 
     $text = "<div style='text-align:center;width:220px'><br />".LAN_MAILOUT_66;   // Cancelled Successfully;
     $text .= "<div style='text-align:center;margin-left:auto;margin-right:auto;position:absolute;left:10px;top:110px'>
-	<br /><input type='button' class='button' name='close' value='Close' onclick=\"window.close()\" />
+	<br /><input type='button' class='btn button' name='close' value='Close' onclick=\"window.close()\" />
      </div></div>";
 
     $ns -> tablerender(LAN_MAILOUT_59, $text);
@@ -244,7 +244,7 @@ $email_info = unserialize($row['gen_chardata']);		// Gives us sender_name, sende
 		echo "<div style='text-align:center;width:200px'><br />".LAN_MAILOUT_61."</div>";
 		echo "</body></html>";
         echo "<div style='text-align:center;margin-left:auto;margin-right:auto;position:absolute;left:10px;top:110px'>
-			<input type='button' class='button' name='close' value='Close' onclick=\"window.close()\" />
+			<input type='button' class='btn button' name='close' value='Close' onclick=\"window.close()\" />
     		 </div>";
 		exit;
 	}
@@ -407,7 +407,7 @@ $email_info = unserialize($row['gen_chardata']);		// Gives us sender_name, sende
 	}
 
 echo "<div style='text-align:center;margin-left:auto;margin-right:auto;position:absolute;left:10px;top:110px'>
-	<br /><input type='button' class='button' name='close' value='Close' onclick=\"window.close()\" />
+	<br /><input type='button' class='btn button' name='close' value='Close' onclick=\"window.close()\" />
      </div>";
 echo "</body></html>";
 
diff --git a/e107_handlers/user_select_class.php b/e107_handlers/user_select_class.php
index 06cf8b890..204245726 100644
--- a/e107_handlers/user_select_class.php
+++ b/e107_handlers/user_select_class.php
@@ -250,7 +250,7 @@ class user_select
 			}
 			$text .= "
 			</select>
-			<input type='button' class='button' value='".US_LAN_1."' onClick='SelectUser()' />
+			<input type='button' class='btn button' value='".US_LAN_1."' onClick='SelectUser()' />
 			</td>
 
 			</tr>