diff --git a/html/inc/account.inc b/html/inc/account.inc
index 7942a3b417..1760c71353 100644
--- a/html/inc/account.inc
+++ b/html/inc/account.inc
@@ -61,7 +61,7 @@ function create_account_form($teamid, $next_url) {
     row2(tra("Confirm password"), "<input type=\"password\" name=\"passwd2\">");
     row2_init(
         tra("Country")."<br><p class=\"text-info\">".tra("Select the country you want to represent, if any.")."</p>",
-        "<select name=\"country\">"
+        "<select class=\"form-control\" name=\"country\">"
     );
     print_country_select();
     echo "</select></td></tr>\n";
diff --git a/html/inc/bbcode_html.inc b/html/inc/bbcode_html.inc
index 275458601f..20310145dc 100644
--- a/html/inc/bbcode_html.inc
+++ b/html/inc/bbcode_html.inc
@@ -43,7 +43,7 @@ $bbcode_html = '
               <table width="100%" border="0" cellspacing="0" cellpadding="0">
                 <tr>
                   <td><nobr><span class="genmed">&nbsp;'.tra("Font color").':
-                    <select name="addbbcode22" onChange="bbfontstyle(\'[color=\' + this.form.addbbcode22.options[this.form.addbbcode22.selectedIndex].value + \']\', \'[/color]\');this.selectedIndex=0;" title="'.tra("Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000").'" >
+                    <select class="form-control" name="addbbcode22" onChange="bbfontstyle(\'[color=\' + this.form.addbbcode22.options[this.form.addbbcode22.selectedIndex].value + \']\', \'[/color]\');this.selectedIndex=0;" title="'.tra("Font color: [color=red]text[/color]  Tip: you can also use color=#FF0000").'" >
                       <option style="color:black" value="#000000" class="genmed">'.tra("Default").'</option>
                       <option style="color:darkred" value="darkred" class="genmed">'.tra("Dark Red").'</option>
                       <option style="color:red" value="red" class="genmed">'.tra("Red").'</option>
@@ -58,7 +58,7 @@ $bbcode_html = '
                       <option style="color:indigo" value="indigo" class="genmed">'.tra("Indigo").'</option>
                       <option style="color:violet" value="violet" class="genmed">'.tra("Violet").'</option>
                     </select>&nbsp;'.tra("Font size").':
-		    <select name="addbbcode24" onChange="bbfontstyle(\'[size=\' + this.form.addbbcode24.options[this.form.addbbcode24.selectedIndex].value + \']\', \'[/size]\');this.selectedIndex=0;" title="'.tra("Font size: [size=x-small]small text[/size]").'" >
+		    <select class="form-control" name="addbbcode24" onChange="bbfontstyle(\'[size=\' + this.form.addbbcode24.options[this.form.addbbcode24.selectedIndex].value + \']\', \'[/size]\');this.selectedIndex=0;" title="'.tra("Font size: [size=x-small]small text[/size]").'" >
                       <option value="12" selected class="genmed">'.tra("Default").'</option>
             	      <option value="9" class="genmed">'.tra("Small").'</option>
                       <option value="12" class="genmed">'.tra("Normal").'</option>
diff --git a/html/inc/host.inc b/html/inc/host.inc
index fcd19feb6e..05a6afeac2 100644
--- a/html/inc/host.inc
+++ b/html/inc/host.inc
@@ -51,7 +51,7 @@ function location_form($host) {
     if ($host->venue == "school") $s = "selected";
     $x = "<form action=host_venue_action.php>
         <input type=hidden name=hostid value=$host->id>
-        <select name=venue>
+        <select class=\"form-control\" name=venue>
         <option value=\"\" $none>---
         <option value=home $h>".tra("Home")."
         <option value=work $w>".tra("Work")."
diff --git a/html/inc/language_names.inc b/html/inc/language_names.inc
index 5cdb868643..6db9b1f6a9 100644
--- a/html/inc/language_names.inc
+++ b/html/inc/language_names.inc
@@ -81,7 +81,7 @@ function language_form() {
     echo "
         <table><tr><td>
         <form name=language method=get action=set_language.php>
-        <select class=selectbox name=lang onchange=\"javascript: submit()\">
+        <select class=\"selectbox form-control\" name=lang onchange=\"javascript: submit()\">
     ";
     language_select();
     echo "</select>
diff --git a/html/inc/prefs.inc b/html/inc/prefs.inc
index 420bfc3753..c5e9bd90f0 100644
--- a/html/inc/prefs.inc
+++ b/html/inc/prefs.inc
@@ -670,7 +670,7 @@ function venue_form($user) {
     tooltip_row2(
         VENUE_TOOLTIP,
         VENUE_DESC,
-        "<select name=default_venue>
+        "<select class=\"form-control\" name=default_venue>
         <option value=\"\" $n>---
         <option value=home $h>".tra("Home")."
         <option value=work $w>".tra("Work")."
diff --git a/html/inc/prefs_util.inc b/html/inc/prefs_util.inc
index f84c6300d6..40173756fc 100644
--- a/html/inc/prefs_util.inc
+++ b/html/inc/prefs_util.inc
@@ -443,7 +443,7 @@ class PREF_NUM2 extends PREF {
 
 function hour_select($x, $name, $id, $d) {
     $s = "";
-    $s = $s. "<select name=$name id=$id $d>\n";
+    $s = $s. "<select class=\"form-control\" name=$name id=$id $d>\n";
     for ($i=0; $i<24; $i++) {
         $sel = ($x == $i)?"selected":"";
         $s = $s."<option value=$i $sel> $i:00";
diff --git a/html/inc/sandbox.inc b/html/inc/sandbox.inc
index 1729dbf597..c2f1e7a81f 100644
--- a/html/inc/sandbox.inc
+++ b/html/inc/sandbox.inc
@@ -119,7 +119,7 @@ function sandbox_file_select($user, $select_name, $regexp = null, $allow_none =
     if ($regexp === null) {
         $regexp = $select_name;
     }
-    $x = "<select name=$select_name>\n";
+    $x = "<select class=\"form-control\" name=$select_name>\n";
     if ($allow_none) {
         $x .= "<option value=\"\">--- None</option>\n";
     }
diff --git a/html/inc/team.inc b/html/inc/team.inc
index f075c8f7ac..489ffe9f5a 100644
--- a/html/inc/team.inc
+++ b/html/inc/team.inc
@@ -41,7 +41,7 @@ function team_search_form($params) {
     row2(tra('Key words').'<br><p class=\"text-muted\">'.tra('Find teams with these words in their names or descriptions').'</p>',
         '<input type="text" name="keywords" value="' . htmlspecialchars($params->keywords) . '">');
     row2_init(tra('Country'), '');
-    echo '<select name="country"><option value="" selected>---</option>';
+    echo '<select class="form-control" name="country"><option value="" selected>---</option>';
     $country = $params->country;
     if (!$country || $country == 'None') $country = "XXX";
     print_country_select($country);
@@ -473,7 +473,7 @@ function team_edit_form($team, $label, $url) {
     row2(tra('Type of team').':', team_type_select($team?$team->type:null));
 
     row2_init(tra('Country'),
-        "<select name=country>"
+        "<select class=\"form-control\" name=country>"
     );
     print_country_select($team?$team->country:null);
 
diff --git a/html/inc/util.inc b/html/inc/util.inc
index 06933f270c..95aa901187 100644
--- a/html/inc/util.inc
+++ b/html/inc/util.inc
@@ -739,7 +739,7 @@ function verify_numeric(&$value, $low, $high = false) {
 
 // Generate a "select" HTML element from an array of values
 function select_from_array($name, $array, $selection) {
-    $out = "<select name=\"$name\">";
+    $out = "<select class=\"form-control\" name=\"$name\">";
 
     foreach ($array as $key => $value) {
         if ($value) {