diff --git a/admin/dataentry.php b/admin/dataentry.php
index cd1fb492499..667a56a43cb 100644
--- a/admin/dataentry.php
+++ b/admin/dataentry.php
@@ -600,7 +600,7 @@
 					case "5": //5 POINT CHOICE radio-buttons
 					for ($x=1; $x<=5; $x++)
 					{
-						$dataentryoutput .= "\t\t\t<input type='radio' name='{$fnames[$i][0]}' value='$x'";
+						$dataentryoutput .= "\t\t\t<input type='radio' class='radiobtn' name='{$fnames[$i][0]}' value='$x'";
 						if ($idrow[$fnames[$i][0]] == $x) {$dataentryoutput .= " checked";}
 						$dataentryoutput .= " />$x \n";
 					}
@@ -905,7 +905,7 @@
 						}
 						else
 						{
-							$dataentryoutput .= "\t\t\t$setfont<input type='checkbox' name='{$fnames[$i][0]}' value='Y'";
+							$dataentryoutput .= "\t\t\t$setfont<input type='checkbox' class='checkboxbtn' name='{$fnames[$i][0]}' value='Y'";
 							if ($idrow[$fnames[$i][0]] == "Y") {$dataentryoutput .= " checked";}
 							$dataentryoutput .= " />{$fnames[$i][6]}</font><br />\n";
 						}
@@ -926,7 +926,7 @@
 					while ($fnames[$i][3] == "U" && $question != "" && $question == $fnames[$i][2])
 					{
 						$fieldn = substr($fnames[$i][0], 0, strlen($fnames[$i][0]));
-						$dataentryoutput .= "\t\t\t$setfont<input type='checkbox' name='{$fnames[$i][0]}' value='Y'";
+						$dataentryoutput .= "\t\t\t$setfont<input type='checkbox' class='checkboxbtn' name='{$fnames[$i][0]}' value='Y'";
 						if ($idrow[$fnames[$i][0]] == "Y") {$dataentryoutput .= " checked";}
 						$dataentryoutput .= " />{$fnames[$i][6]}<br />\n";
 						if ($i<$nfncount)
@@ -987,7 +987,7 @@
 						else
 						{
 							$dataentryoutput .= "\t<tr>\n"
-							."\t\t<td>$setfont<input type='checkbox' name=\"{$fnames[$i][0]}\" value='Y'";
+							."\t\t<td>$setfont<input type='checkbox' class='checkboxbtn' name=\"{$fnames[$i][0]}\" value='Y'";
 							if ($idrow[$fnames[$i][0]] == "Y") {$dataentryoutput .= " checked";}
 							$dataentryoutput .= " />{$fnames[$i][6]}</font></td>\n";
 						}
@@ -1037,7 +1037,7 @@
 						."\t\t<td>$setfont\n";
 						for ($j=1; $j<=5; $j++)
 						{
-							$dataentryoutput .= "\t\t\t<input type='radio' name='{$fnames[$i][0]}' value='$j'";
+							$dataentryoutput .= "\t\t\t<input type='radio' class='radiobtn' name='{$fnames[$i][0]}' value='$j'";
 							if ($idrow[$fnames[$i][0]] == $j) {$dataentryoutput .= " checked";}
 							$dataentryoutput .= " />$j&nbsp;\n";
 						}
@@ -1059,7 +1059,7 @@
 						."\t\t<td>$setfont\n";
 						for ($j=1; $j<=10; $j++)
 						{
-							$dataentryoutput .= "\t\t\t<input type='radio' name='{$fnames[$i][0]}' value='$j'";
+							$dataentryoutput .= "\t\t\t<input type='radio' class='radiobtn' name='{$fnames[$i][0]}' value='$j'";
 							if ($idrow[$fnames[$i][0]] == $j) {$dataentryoutput .= " checked";}
 							$dataentryoutput .= " />$j&nbsp;\n";
 						}
@@ -1079,13 +1079,13 @@
 						$dataentryoutput .= "\t<tr>\n"
 						."\t\t<td align='right'>$setfont{$fnames[$i][6]}</font></td>\n"
 						."\t\t<td>$setfont\n"
-						."\t\t\t<input type='radio' name='{$fnames[$i][0]}' value='Y'";
+						."\t\t\t<input type='radio' class='radiobtn' name='{$fnames[$i][0]}' value='Y'";
 						if ($idrow[$fnames[$i][0]] == "Y") {$dataentryoutput .= " checked";}
 						$dataentryoutput .= " />".$clang->gT("Yes")."&nbsp;\n"
-						."\t\t\t<input type='radio' name='{$fnames[$i][0]}' value='U'";
+						."\t\t\t<input type='radio' class='radiobtn' name='{$fnames[$i][0]}' value='U'";
 						if ($idrow[$fnames[$i][0]] == "U") {$dataentryoutput .= " checked";}
 						$dataentryoutput .= " />".$clang->gT("Uncertain")."&nbsp;\n"
-						."\t\t\t<input type='radio' name='{$fnames[$i][0]}' value='N'";
+						."\t\t\t<input type='radio' class='radiobtn' name='{$fnames[$i][0]}' value='N'";
 						if ($idrow[$fnames[$i][0]] == "N") {$dataentryoutput .= " checked";}
 						$dataentryoutput .= " />".$clang->gT("No")."&nbsp;\n"
 						."\t\t</font></td>\n"
@@ -1104,13 +1104,13 @@
 						$dataentryoutput .= "\t<tr>\n"
 						."\t\t<td align='right'>$setfont{$fnames[$i][6]}</font></td>\n"
 						."\t\t<td>$setfont\n"
-						."\t\t\t<input type='radio' name='{$fnames[$i][0]}' value='I'";
+						."\t\t\t<input type='radio' class='radiobtn' name='{$fnames[$i][0]}' value='I'";
 						if ($idrow[$fnames[$i][0]] == "I") {$dataentryoutput .= " checked";}
 						$dataentryoutput .= " />Increase&nbsp;\n"
-						."\t\t\t<input type='radio' name='{$fnames[$i][0]}' value='S'";
+						."\t\t\t<input type='radio' class='radiobtn' name='{$fnames[$i][0]}' value='S'";
 						if ($idrow[$fnames[$i][0]] == "I") {$dataentryoutput .= " checked";}
 						$dataentryoutput .= " />Same&nbsp;\n"
-						."\t\t\t<input type='radio' name='{$fnames[$i][0]}' value='D'";
+						."\t\t\t<input type='radio' class='radiobtn' name='{$fnames[$i][0]}' value='D'";
 						if ($idrow[$fnames[$i][0]] == "D") {$dataentryoutput .= " checked";}
 						$dataentryoutput .= " />Decrease&nbsp;\n"
 						."\t\t</font></td>\n"
@@ -1134,7 +1134,7 @@
 						$dataentryoutput .= "\t\t<td>$setfont\n";
 						while ($frow=$fresult->FetchRow())
 						{
-							$dataentryoutput .= "\t\t\t<input type='radio' name='{$fnames[$i][0]}' value='{$frow['code']}'";
+							$dataentryoutput .= "\t\t\t<input type='radio' class='radiobtn' name='{$fnames[$i][0]}' value='{$frow['code']}'";
 							if ($idrow[$fnames[$i][0]] == $frow['code']) {$dataentryoutput .= " checked";}
 							$dataentryoutput .= " />".$frow['title']."&nbsp;\n";
 						}
@@ -1191,7 +1191,7 @@ function saveshow(value)
 				  </script>\n";
 			$dataentryoutput .= "\t<tr>\n";
 			$dataentryoutput .= "\t\t<td colspan='3' align='center' bgcolor='#CCCCCC'>$setfont\n";
-			$dataentryoutput .= "\t\t\t<input type='checkbox' name='save' id='save' onchange='saveshow(this.id)' onLoad='saveshow(this.id)'><label for='save'>".$clang->gT("Save as a partially completed survey")."</label>\n";
+			$dataentryoutput .= "\t\t\t<input type='checkbox' class='checkboxbtn' name='save' id='save' onchange='saveshow(this.id)' onLoad='saveshow(this.id)'><label for='save'>".$clang->gT("Save as a partially completed survey")."</label>\n";
 			$dataentryoutput .= "<div name='saveoptions' id='saveoptions' style='display: none'>\n";
 			$dataentryoutput .= "<table align='center' class='outlinetable' cellspacing='0'>
 				  <tr><td align='right'>".$clang->gT("Identifier:")."</td>
@@ -1905,7 +1905,7 @@ function saveshow(value)
 								$dataentryoutput .= $divider;
 								$upto=0;
 							}
-							$dataentryoutput .= "\t\t\t$setfont<input type='checkbox' name='$fieldname{$mearow['code']}' id='answer$fieldname{$mearow['code']}' value='Y'";
+							$dataentryoutput .= "\t\t\t$setfont<input type='checkbox' class='checkboxbtn' name='$fieldname{$mearow['code']}' id='answer$fieldname{$mearow['code']}' value='Y'";
 							if ($mearow['default_value'] == "Y") {$dataentryoutput .= " checked";}
 							$dataentryoutput .= " /><label for='$fieldname{$mearow['code']}'>{$mearow['answer']}</label></font><br />\n";
 							$upto++;
@@ -1922,7 +1922,7 @@ function saveshow(value)
 					{
 						while ($mearow = $mearesult->FetchRow())
 						{
-							$dataentryoutput .= "\t\t\t$setfont<input type='checkbox' name='$fieldname{$mearow['code']}' id='answer$fieldname{$mearow['code']}' value='Y'";
+							$dataentryoutput .= "\t\t\t$setfont<input type='checkbox' class='checkboxbtn' name='$fieldname{$mearow['code']}' id='answer$fieldname{$mearow['code']}' value='Y'";
 							if ($mearow['default_value'] == "Y") {$dataentryoutput .= " checked";}
 							$dataentryoutput .= " /><label for='$fieldname{$mearow['code']}'>{$mearow['answer']}</label></font><br />\n";
 						}
@@ -1938,7 +1938,7 @@ function saveshow(value)
 					$mearesult = db_execute_assoc($meaquery);
 					while ($mearow = $mearesult->FetchRow())
 					{
-						$dataentryoutput .= "\t\t\t$setfont<input type='checkbox' name='$fieldname{$mearow['code']}' value='Y'";
+						$dataentryoutput .= "\t\t\t$setfont<input type='checkbox' class='checkboxbtn' name='$fieldname{$mearow['code']}' value='Y'";
 						if ($mearow['default_value'] == "Y") {$dataentryoutput .= " checked";}
 						$dataentryoutput .= " />{$mearow['answer']}<br />\n";
 					}
@@ -1963,7 +1963,7 @@ function saveshow(value)
 					{
 						$dataentryoutput .= "\t<tr>\n";
 						$dataentryoutput .= "\t\t<td>\n";
-						$dataentryoutput .= "\t\t\t$setfont<input type='checkbox' name='$fieldname{$mearow['code']}' value='Y'";
+						$dataentryoutput .= "\t\t\t$setfont<input type='checkbox' class='checkboxbtn' name='$fieldname{$mearow['code']}' value='Y'";
 						if ($mearow['default_value'] == "Y") {$dataentryoutput .= " checked";}
 						$dataentryoutput .= " />{$mearow['answer']}\n";
 						$dataentryoutput .= "\t\t</font></td>\n";
@@ -2140,7 +2140,7 @@ function saveshow(value)
 					  </script>\n";
 				$dataentryoutput .= "\t<tr>\n";
 				$dataentryoutput .= "\t\t<td colspan='3' align='center' bgcolor='#CCCCCC'>$setfont\n";
-				$dataentryoutput .= "\t\t\t<input type='checkbox' name='save' id='save' onchange='saveshow(this.id)' onLoad='saveshow(this.id)'><label for='save'>".$clang->gT("Save as a partially completed survey")."</label>\n";
+				$dataentryoutput .= "\t\t\t<input type='checkbox' class='checkboxbtn' name='save' id='save' onchange='saveshow(this.id)' onLoad='saveshow(this.id)'><label for='save'>".$clang->gT("Save as a partially completed survey")."</label>\n";
 				$dataentryoutput .= "<div name='saveoptions' id='saveoptions' style='display: none'>\n";
 				$dataentryoutput .= "<table align='center' class='outlinetable' cellspacing='0'>
 					  <tr><td align='right'>".$clang->gT("Identifier:")."</td>
diff --git a/admin/exportresults.php b/admin/exportresults.php
index e17d2f60d84..b166881d3fb 100644
--- a/admin/exportresults.php
+++ b/admin/exportresults.php
@@ -134,13 +134,13 @@
 	.$clang->gT("Questions")."</strong></font></font></td></tr>\n"
 	."\t<tr>\n"
 	."\t\t<td>\n"
-	."\t\t\t$setfont<input type='radio' name='style' value='abrev' id='headabbrev'>"
+	."\t\t\t$setfont<input type='radio' class='radiobtn' name='style' value='abrev' id='headabbrev'>"
 	."<font size='1'><label for='headabbrev'>"
 	.$clang->gT("Abbreviated headings")."</label><br />\n"
-	."\t\t\t<input type='radio' checked name='style' value='full' id='headfull'>"
+	."\t\t\t<input type='radio' class='radiobtn' checked name='style' value='full' id='headfull'>"
 	."<label for='headfull'>"
 	.$clang->gT("Full headings")."</label><br />\n"
-	."\t\t\t<input type='radio' checked name='style' value='headcodes' id='headcodes'>"
+	."\t\t\t<input type='radio' class='radiobtn' checked name='style' value='headcodes' id='headcodes'>"
 	."<label for='headcodes'>"
 	.$clang->gT("Question Codes")."</label>\n"
 	."\t\t</font></font></td>\n"
@@ -149,10 +149,10 @@
 	.$clang->gT("Answers")."</strong></font></font></td></tr>\n"
 	."\t<tr>\n"
 	."\t\t<td>\n"
-	."\t\t\t$setfont<input type='radio' name='answers' value='short' id='ansabbrev'>"
+	."\t\t\t$setfont<input type='radio' class='radiobtn' name='answers' value='short' id='ansabbrev'>"
 	."<font size='1'><label for='ansabbrev'>"
 	.$clang->gT("Answer Codes")."</label><br />\n"
-	."\t\t\t<input type='radio' checked name='answers' value='long' id='ansfull'>"
+	."\t\t\t<input type='radio' class='radiobtn' checked name='answers' value='long' id='ansfull'>"
 	."<label for='ansfull'>"
 	.$clang->gT("Full Answers")."</label>\n"
 	."\t\t</font></font></td>\n"
@@ -161,13 +161,13 @@
 	.$clang->gT("Format")."</strong></font></font></td></tr>\n"
 	."\t<tr>\n"
 	."\t\t<td>\n"
-	."\t\t\t$setfont<input type='radio' name='type' value='doc' id='worddoc'>"
+	."\t\t\t$setfont<input type='radio' class='radiobtn' name='type' value='doc' id='worddoc'>"
 	."<font size='1'><label for='worddoc'>"
 	.$clang->gT("Microsoft Word")."</label><br />\n"
-	."\t\t\t<input type='radio' name='type' value='xls' checked id='exceldoc'>"
+	."\t\t\t<input type='radio' class='radiobtn' name='type' value='xls' checked id='exceldoc'>"
 	."<label for='exceldoc'>"
 	.$clang->gT("Microsoft Excel")."</label><br />\n"
-	."\t\t\t<input type='radio' name='type' value='csv' id='csvdoc'>"
+	."\t\t\t<input type='radio' class='radiobtn' name='type' value='csv' id='csvdoc'>"
 	."<label for='csvdoc'>"
 	.$clang->gT("CSV Comma Delimited")."</label>\n"
 	."\t\t</font></font></td>\n"
@@ -280,22 +280,22 @@
 			."<img src='$imagefiles/help.gif' alt='".$clang->gT("Help")."' align='right' onclick='javascript:alert(\""
 			.$clang->gT("Your survey can export associated token data with each response. Select any additional fields you would like to export.","js")
 			."\")' /><br /><br />\n"
-			."<input type='checkbox' name='first_name' id='first_name'>"
+			."<input type='checkbox' class='checkboxbtn' name='first_name' id='first_name'>"
 			."<label for='first_name'>".$clang->gT("First Name")."</label><br />\n"
-			."<input type='checkbox' name='last_name' id='last_name'>"
+			."<input type='checkbox' class='checkboxbtn' name='last_name' id='last_name'>"
 			."<label for='last_name'>".$clang->gT("Last Name")."</label><br />\n"
-			."<input type='checkbox' name='email_address' id='email_address'>"
+			."<input type='checkbox' class='checkboxbtn' name='email_address' id='email_address'>"
 			."<label for='email_address'>".$clang->gT("Email")."</label><br />\n"
-			."<input type='checkbox' name='token' id='token'>"
+			."<input type='checkbox' class='checkboxbtn' name='token' id='token'>"
 			."<label for='token'>".$clang->gT("Token")."</label><br />\n";
 			$query = "SELECT * FROM {$dbprefix}tokens_$surveyid"; //SEE IF TOKENS TABLE HAS ATTRIBUTE FIELDS
 			$result = db_select_limit_assoc($query, 1) or die ($query."<br />".htmlspecialchars($connect->ErrorMsg()));
 			$rowcount = $result->FieldCount();
 			if ($rowcount > 7)
 			{
-				$exportoutput .= "<input type='checkbox' name='attribute_1' id='attribute_1'>"
+				$exportoutput .= "<input type='checkbox' class='checkboxbtn' name='attribute_1' id='attribute_1'>"
 				."<label for='attribute_1'>".$clang->gT("Attribute 1")."</label><br />\n"
-				."<input type='checkbox' name='attribute_2' id='attribute_2'>"
+				."<input type='checkbox' class='checkboxbtn' name='attribute_2' id='attribute_2'>"
 				."<label for='attribute_2'>".$clang->gT("Attribute 2")."</label><br />\n";
 			}
 			$exportoutput .= "\t\t</font></font></td>\n"
diff --git a/admin/html.php b/admin/html.php
index 21e30e8fe2b..0b3be57a2ee 100644
--- a/admin/html.php
+++ b/admin/html.php
@@ -1561,32 +1561,32 @@
 			. "<form action='$scriptname?sid={$surveyid}' method='post'>\n";
 
 			//content
-			$usersummary .= "\t\t<td align='center'><input type=\"checkbox\" name=\"edit_survey_property\" value=\"edit_survey_property\"";
+			$usersummary .= "\t\t<td align='center'><input type=\"checkbox\"  class=\"checkboxbtn\" name=\"edit_survey_property\" value=\"edit_survey_property\"";
 			if($resul2row['edit_survey_property']) {
 				$usersummary .= " checked ";
 			}
 			$usersummary .=" /></td>\n";
-			$usersummary .= "\t\t<td align='center'><input type=\"checkbox\" name=\"define_questions\" value=\"define_questions\"";
+			$usersummary .= "\t\t<td align='center'><input type=\"checkbox\"  class=\"checkboxbtn\" name=\"define_questions\" value=\"define_questions\"";
 			if($resul2row['define_questions']) {
 				$usersummary .= " checked ";
 			}
 			$usersummary .=" /></td>\n";
-			$usersummary .= "\t\t<td align='center'><input type=\"checkbox\" name=\"browse_response\" value=\"browse_response\"";
+			$usersummary .= "\t\t<td align='center'><input type=\"checkbox\"  class=\"checkboxbtn\" name=\"browse_response\" value=\"browse_response\"";
 			if($resul2row['browse_response']) {
 				$usersummary .= " checked ";
 			}
 			$usersummary .=" /></td>\n";
-			$usersummary .= "\t\t<td align='center'><input type=\"checkbox\" name=\"export\" value=\"export\"";
+			$usersummary .= "\t\t<td align='center'><input type=\"checkbox\"  class=\"checkboxbtn\" name=\"export\" value=\"export\"";
 			if($resul2row['export']) {
 				$usersummary .= " checked ";
 			}
 			$usersummary .=" /></td>\n";
-			$usersummary .= "\t\t<td align='center'><input type=\"checkbox\" name=\"delete_survey\" value=\"delete_survey\"";
+			$usersummary .= "\t\t<td align='center'><input type=\"checkbox\"  class=\"checkboxbtn\" name=\"delete_survey\" value=\"delete_survey\"";
 			if($resul2row['delete_survey']) {
 				$usersummary .= " checked ";
 			}
 			$usersummary .=" /></td>\n";
-			$usersummary .= "\t\t<td align='center'><input type=\"checkbox\" name=\"activate_survey\" value=\"activate_survey\"";
+			$usersummary .= "\t\t<td align='center'><input type=\"checkbox\"  class=\"checkboxbtn\" name=\"activate_survey\" value=\"activate_survey\"";
 			if($resul2row['activate_survey']) {
 				$usersummary .= " checked ";
 			}
@@ -1626,22 +1626,22 @@
 		. "<form action='$scriptname?sid={$surveyid}' method='post'>\n";
 
 		//content
-		$usersummary .= "\t\t<td align='center'><input type=\"checkbox\" name=\"edit_survey_property\" value=\"edit_survey_property\"";
+		$usersummary .= "\t\t<td align='center'><input type=\"checkbox\"  class=\"checkboxbtn\" name=\"edit_survey_property\" value=\"edit_survey_property\"";
 
 		$usersummary .=" /></td>\n";
-		$usersummary .= "\t\t<td align='center'><input type=\"checkbox\" name=\"define_questions\" value=\"define_questions\"";
+		$usersummary .= "\t\t<td align='center'><input type=\"checkbox\"  class=\"checkboxbtn\" name=\"define_questions\" value=\"define_questions\"";
 
 		$usersummary .=" /></td>\n";
-		$usersummary .= "\t\t<td align='center'><input type=\"checkbox\" name=\"browse_response\" value=\"browse_response\"";
+		$usersummary .= "\t\t<td align='center'><input type=\"checkbox\"  class=\"checkboxbtn\" name=\"browse_response\" value=\"browse_response\"";
 
 		$usersummary .=" /></td>\n";
-		$usersummary .= "\t\t<td align='center'><input type=\"checkbox\" name=\"export\" value=\"export\"";
+		$usersummary .= "\t\t<td align='center'><input type=\"checkbox\"  class=\"checkboxbtn\" name=\"export\" value=\"export\"";
 
 		$usersummary .=" /></td>\n";
-		$usersummary .= "\t\t<td align='center'><input type=\"checkbox\" name=\"delete_survey\" value=\"delete_survey\"";
+		$usersummary .= "\t\t<td align='center'><input type=\"checkbox\"  class=\"checkboxbtn\" name=\"delete_survey\" value=\"delete_survey\"";
 
 		$usersummary .=" /></td>\n";
-		$usersummary .= "\t\t<td align='center'><input type=\"checkbox\" name=\"activate_survey\" value=\"activate_survey\"";
+		$usersummary .= "\t\t<td align='center'><input type=\"checkbox\"  class=\"checkboxbtn\" name=\"activate_survey\" value=\"activate_survey\"";
 
 		$usersummary .=" /></td>\n";
 
diff --git a/admin/questionhandling.php b/admin/questionhandling.php
index 546cf47eec1..e584aa8edc5 100644
--- a/admin/questionhandling.php
+++ b/admin/questionhandling.php
@@ -92,9 +92,9 @@
 		. "\t\t<td align='right'><strong>".$clang->gT("Other:")."</strong></td>\n"
 		. "\t\t<td align='left'>\n"
 		. "\t\t\t<label for='OY'>".$clang->gT("Yes")."</label>"
-		. "<input id='OY' type='radio' name='other' value='Y' />&nbsp;&nbsp;\n"
+		. "<input id='OY' type='radio' class='radiobtn' name='other' value='Y' />&nbsp;&nbsp;\n"
 		. "\t\t\t<label for='ON'>".$clang->gT("No")."</label>"
-		. "<input id='ON' type='radio' name='other' value='N' checked='checked' />\n"
+		. "<input id='ON' type='radio' class='radiobtn' name='other' value='N' checked='checked' />\n"
 		. "\t\t</td>\n"
 		. "\t</tr>\n";
 
@@ -102,9 +102,9 @@
 		. "\t\t<td align='right'><strong>".$clang->gT("Mandatory:")."</strong></td>\n"
 		. "\t\t<td align='left'>\n"
 		. "\t\t\t<label for='MY'>".$clang->gT("Yes")."</label>"
-		. "<input id='MY' type='radio' name='mandatory' value='Y' />&nbsp;&nbsp;\n"
+		. "<input id='MY' type='radio' class='radiobtn' name='mandatory' value='Y' />&nbsp;&nbsp;\n"
 		. "\t\t\t<label for='MN'>".$clang->gT("No")."</label>"
-		. "<input id='MN' type='radio' name='mandatory' value='N' checked='checked' />\n"
+		. "<input id='MN' type='radio' class='radiobtn' name='mandatory' value='N' checked='checked' />\n"
 		. "\t\t</td>\n"
 		. "\t</tr>\n";
 
@@ -237,10 +237,10 @@
 		. "\t\t<td align='right'><strong>".$clang->gT("Other:")."</strong></td>\n";
 
 		$editquestion .= "\t\t<td>\n"
-		. "\t\t\t".$clang->gT("Yes")." <input type='radio' name='other' value='Y'";
+		. "\t\t\t".$clang->gT("Yes")." <input type='radio' class='radiobtn' name='other' value='Y'";
 		if ($eqrow['other'] == "Y") {$editquestion .= " checked";}
 		$editquestion .= " />&nbsp;&nbsp;\n"
-		. "\t\t\t".$clang->gT("No")." <input type='radio' name='other' value='N'";
+		. "\t\t\t".$clang->gT("No")." <input type='radio' class='radiobtn' name='other' value='N'";
 		if ($eqrow['other'] == "N") {$editquestion .= " checked";}
 		$editquestion .= " />\n"
 		. "\t\t</td>\n"
@@ -249,10 +249,10 @@
 		$editquestion .= "\t<tr id='MandatorySelection'>\n"
 		. "\t\t<td align='right'><strong>".$clang->gT("Mandatory:")."</strong></td>\n"
 		. "\t\t<td>\n"
-		. "\t\t\t".$clang->gT("Yes")." <input type='radio' name='mandatory' value='Y'";
+		. "\t\t\t".$clang->gT("Yes")." <input type='radio' class='radiobtn' name='mandatory' value='Y'";
 		if ($eqrow['mandatory'] == "Y") {$editquestion .= " checked='checked'";}
 		$editquestion .= " />&nbsp;&nbsp;\n"
-		. "\t\t\t".$clang->gT("No")." <input type='radio' name='mandatory' value='N'";
+		. "\t\t\t".$clang->gT("No")." <input type='radio' class='radiobtn' name='mandatory' value='N'";
 		if ($eqrow['mandatory'] != "Y") {$editquestion .= " checked='checked'";}
 		$editquestion .= " />\n"
 		. "\t\t</td>\n"
@@ -278,12 +278,12 @@
 		{
 
 			$editquestion .= "<strong>".$clang->gT("Copy Answers?")."</strong></td>\n"
-			. "\t\t<td><input type='checkbox' checked name='copyanswers' value='Y' />"
+			. "\t\t<td><input type='checkbox' class='checkboxbtn' checked name='copyanswers' value='Y' />"
 			. "</td>\n"
 			. "\t</tr>\n"
 			. "\t<tr>\n"
 			. "\t\t<td align='right'><strong>".$clang->gT("Copy Attributes?")."</strong></td>\n"
-			. "\t\t<td><input type='checkbox' checked name='copyattributes' value='Y' />"
+			. "\t\t<td><input type='checkbox' class='checkboxbtn' checked name='copyattributes' value='Y' />"
 			. "</td>\n"
 			. "\t</tr>\n"
 			. "\t<tr>\n"
@@ -440,10 +440,10 @@
   		if ($activated != "Y")
   		{
   			$editquestion .= "\t\t<td align='left'>\n"
-  			. "\t\t\t<label for='OY'>".$clang->gT("Yes")."</label><input id='OY' type='radio' name='other' value='Y'";
+  			. "\t\t\t<label for='OY'>".$clang->gT("Yes")."</label><input id='OY' type='radio' class='radiobtn' name='other' value='Y'";
   			if ($eqrow['other'] == "Y") {$editquestion .= " checked";}
   			$editquestion .= " />&nbsp;&nbsp;\n"
-  			. "\t\t\t<label for='ON'>".$clang->gT("No")."</label><input id='ON' type='radio' name='other' value='N'";
+  			. "\t\t\t<label for='ON'>".$clang->gT("No")."</label><input id='ON' type='radio' class='radiobtn' name='other' value='N'";
   			if ($eqrow['other'] == "N" || $eqrow['other'] == "" ) {$editquestion .= " checked='checked'";}
   			$editquestion .= " />\n"
   			. "\t\t</td>\n";
@@ -458,10 +458,10 @@
   		$editquestion .= "\t<tr id='MandatorySelection'>\n"
   		. "\t\t<td align='right'><strong>".$clang->gT("Mandatory:")."</strong></td>\n"
   		. "\t\t<td align='left'>\n"
-  		. "\t\t\t<label for='MY'>".$clang->gT("Yes")."</label><input id='MY' type='radio' name='mandatory' value='Y'";
+  		. "\t\t\t<label for='MY'>".$clang->gT("Yes")."</label><input id='MY' type='radio' class='radiobtn' name='mandatory' value='Y'";
   		if ($eqrow['mandatory'] == "Y") {$editquestion .= " checked='checked'";}
   		$editquestion .= " />&nbsp;&nbsp;\n"
-  		. "\t\t\t<label for='MN'>".$clang->gT("No")."</label><input id='MN' type='radio' name='mandatory' value='N'";
+  		. "\t\t\t<label for='MN'>".$clang->gT("No")."</label><input id='MN' type='radio' class='radiobtn' name='mandatory' value='N'";
   		if ($eqrow['mandatory'] != "Y") {$editquestion .= " checked='checked'";}
   		$editquestion .= " />\n"
   		. "\t\t</td>\n"
diff --git a/admin/statistics.php b/admin/statistics.php
index 23fbc7d56cc..78c613bd4ae 100644
--- a/admin/statistics.php
+++ b/admin/statistics.php
@@ -215,7 +215,7 @@ function show(element) {
 		."$setfont<strong>$flt[3]&nbsp;"; //Heading (Question No)
 		if ($flt[2] == "M" || $flt[2] == "P" || $flt[2] == "R" || $flt[2] == "J") {$myfield = "M$myfield";}
 		if ($flt[2] == "N") {$myfield = "N$myfield";}
-		$statisticsoutput .= "<input type='checkbox' name='summary[]' value='$myfield'";
+		$statisticsoutput .= "<input type='checkbox' class='checkboxbtn' name='summary[]' value='$myfield'";
 		if (isset($_POST['summary']) && (array_search("{$surveyid}X{$flt[1]}X{$flt[0]}", $_POST['summary']) !== FALSE  || array_search("M{$surveyid}X{$flt[1]}X{$flt[0]}", $_POST['summary']) !== FALSE || array_search("N{$surveyid}X{$flt[1]}X{$flt[0]}", $_POST['summary']) !== FALSE))
 		{$statisticsoutput .= " checked='checked'";}
 		$statisticsoutput .= " />&nbsp;"
@@ -240,7 +240,7 @@ function show(element) {
 			$myfield2 = "Q".$myfield."$row[0]";
 			if ($counter2 == 4) {$statisticsoutput .= "\t\t\t\t</tr>\n\t\t\t\t<tr>\n"; $counter2=0;}
 			$statisticsoutput .= "\t\t\t\t<td align='center' valign='top'>$setfont<strong>$flt[3]-".$row[0]."</strong></font>";
-			$statisticsoutput .= "<input type='checkbox' name='summary[]' value='$myfield2'";
+			$statisticsoutput .= "<input type='checkbox' class='checkboxbtn' name='summary[]' value='$myfield2'";
 			if (isset($_POST['summary']) && (array_search("Q{$surveyid}X{$flt[1]}X{$flt[0]}{$row[0]}", $_POST['summary']) !== FALSE))
 			{$statisticsoutput .= " checked='checked'";}
 			$statisticsoutput .= " />&nbsp;"
@@ -265,7 +265,7 @@ function show(element) {
 		$myfield2="T$myfield";
 		$statisticsoutput .= "\t\t\t\t<td align='center' valign='top'>"
 		."$setfont<strong>$flt[3]</strong></font>";
-		$statisticsoutput .= "<input type='checkbox' name='summary[]' value='$myfield2'";
+		$statisticsoutput .= "<input type='checkbox' class='checkboxbtn' name='summary[]' value='$myfield2'";
 		if (isset($_POST['summary']) && (array_search("T{$surveyid}X{$flt[1]}X{$flt[0]}", $_POST['summary']) !== FALSE))
 		{$statisticsoutput .= " checked='checked'";}
 		$statisticsoutput .= " />&nbsp;"
@@ -284,7 +284,7 @@ function show(element) {
 		$myfield2="T$myfield";
 		$statisticsoutput .= "\t\t\t\t<td align='center' valign='top'>"
 		."$setfont<strong>$flt[3]</strong></font>";
-		$statisticsoutput .= "<input type='checkbox' name='summary[]' value='$myfield2'";
+		$statisticsoutput .= "<input type='checkbox' class='checkboxbtn' name='summary[]' value='$myfield2'";
 		if (isset($_POST['summary']) && (array_search("T{$surveyid}X{$flt[1]}X{$flt[0]}", $_POST['summary']) !== FALSE))
 		{$statisticsoutput .= " checked='checked'";}
 		$statisticsoutput .= " />&nbsp;"
@@ -377,7 +377,7 @@ function show(element) {
 			if ($counter2 == 4) {$statisticsoutput .= "\t\t\t\t</tr>\n\t\t\t\t<tr>\n"; $counter2=0;}
 
 			$statisticsoutput .= "\t\t\t\t<td align='center'>$setfont<b>$flt[3] ($row[0])</b>"
-			."<input type='checkbox' name='summary[]' value='$myfield2'";
+			."<input type='checkbox' class='checkboxbtn' name='summary[]' value='$myfield2'";
 			if (isset($_POST['summary']) && array_search($myfield2, $_POST['summary'])!== FALSE) {$statisticsoutput .= " checked='checked'";}
 			$statisticsoutput .= " />&nbsp;"
 			."<img src='$imagefiles/speaker.png' align='bottom' alt=\""
@@ -413,7 +413,7 @@ function show(element) {
 			if ($counter2 == 4) {$statisticsoutput .= "\t\t\t\t</tr>\n\t\t\t\t<tr>\n"; $counter2=0;}
 
 			$statisticsoutput .= "\t\t\t\t<td align='center'>$setfont<b>$flt[3] ($row[0])</b>"; //heading
-			$statisticsoutput .= "<input type='checkbox' name='summary[]' value='$myfield2'";
+			$statisticsoutput .= "<input type='checkbox' class='checkboxbtn' name='summary[]' value='$myfield2'";
 			if (isset($_POST['summary']) && array_search($myfield2, $_POST['summary'])!== FALSE) {$statisticsoutput .= " checked='checked'";}
 			$statisticsoutput .= " />&nbsp;"
 			."<img src='$imagefiles/speaker.png' align='bottom' alt=\""
@@ -450,7 +450,7 @@ function show(element) {
 			$statisticsoutput .= " -->\n";
 			if ($counter2 == 4) {$statisticsoutput .= "\t\t\t\t</tr>\n\t\t\t\t<tr>\n"; $counter2=0;}
 			$statisticsoutput .= "\t\t\t\t<td align='center'>$setfont<b>$flt[3] ($row[0])</b>"
-			."<input type='checkbox' name='summary[]' value='$myfield2'";
+			."<input type='checkbox' class='checkboxbtn' name='summary[]' value='$myfield2'";
 			if (isset($_POST['summary']) && array_search($myfield2, $_POST['summary'])!== FALSE)
 			{$statisticsoutput .= " checked='checked'";}
 			$statisticsoutput .= " />&nbsp;"
@@ -488,7 +488,7 @@ function show(element) {
 			$statisticsoutput .= " -->\n";
 			if ($counter2 == 4) {$statisticsoutput .= "\t\t\t\t</tr>\n\t\t\t\t<tr>\n"; $counter2=0;}
 			$statisticsoutput .= "\t\t\t\t<td align='center'>$setfont<b>$flt[3] ($row[0])</b>"
-			."<input type='checkbox' name='summary[]' value='$myfield2'";
+			."<input type='checkbox' class='checkboxbtn' name='summary[]' value='$myfield2'";
 			if (isset($_POST['summary']) && array_search($myfield2, $_POST['summary'])!== FALSE) {$statisticsoutput .= " checked='checked'";}
 			$statisticsoutput .= " />&nbsp;"
 			."<img src='$imagefiles/speaker.png' align='bottom' alt=\""
@@ -526,7 +526,7 @@ function show(element) {
 			$statisticsoutput .= " -->\n";
 			if ($counter2 == 4) {$statisticsoutput .= "\t\t\t\t</tr>\n\t\t\t\t<tr>\n"; $counter2=0;}
 			$statisticsoutput .= "\t\t\t\t<td align='center'>$setfont<b>$flt[3] ($row[0])</b>"
-			."<input type='checkbox' name='summary[]' value='$myfield2'";
+			."<input type='checkbox' class='checkboxbtn' name='summary[]' value='$myfield2'";
 			if (isset($_POST['summary']) && array_search($myfield2, $_POST['summary'])!== FALSE) {$statisticsoutput .= " checked='checked'";}
 			$statisticsoutput .= " />&nbsp;"
 			."<img src='$imagefiles/speaker.png' align='bottom' alt=\""
@@ -569,7 +569,7 @@ function show(element) {
 			if (isset($_POST[$myfield2])) {$statisticsoutput .= $_POST[$myfield2];}
 			$statisticsoutput .= " -->\n"
 			."\t\t\t\t<td align='center'>$setfont<b>$flt[3] ($i)</b>"
-			."<input type='checkbox' name='summary[]' value='$myfield2'";
+			."<input type='checkbox' class='checkboxbtn' name='summary[]' value='$myfield2'";
 			if (isset($_POST['summary']) && array_search($myfield2, $_POST['summary']) !== FALSE) {$statisticsoutput .= " checked='checked'";}
 			$statisticsoutput .= " />&nbsp;"
 			."<img src='$imagefiles/speaker.png' align='bottom' alt=\""
@@ -602,7 +602,7 @@ function show(element) {
 		case "Z":
 		$statisticsoutput .= "\t\t\t\t<td align='center'>"
 		."$setfont<strong>$flt[3]&nbsp;"; //Heading (Question No)
-		$statisticsoutput .= "<input type='checkbox' name='summary[]' value='$myfield'";
+		$statisticsoutput .= "<input type='checkbox' class='checkboxbtn' name='summary[]' value='$myfield'";
 		if (isset($_POST['summary']) && (array_search("{$surveyid}X{$flt[1]}X{$flt[0]}", $_POST['summary']) !== FALSE  || array_search("M{$surveyid}X{$flt[1]}X{$flt[0]}", $_POST['summary']) !== FALSE || array_search("N{$surveyid}X{$flt[1]}X{$flt[0]}", $_POST['summary']) !== FALSE))
 		{$statisticsoutput .= " checked='checked'";}
 		$statisticsoutput .= " />&nbsp;"
@@ -647,7 +647,7 @@ function show(element) {
 ."\t\t</td></tr>\n"
 ."\t\t<tr><td bgcolor='#CCCCCC' align='center'>\n"
 ."\t\t<font size='1' face='verdana'>&nbsp;</font></td></tr>\n"
-."\t\t\t\t<tr><td align='center'>$setfont<input type='radio' id='viewsummaryall' name='summary' value='$allfield'"
+."\t\t\t\t<tr><td align='center'>$setfont<input type='radio' class='radiobtn' id='viewsummaryall' name='summary' value='$allfield'"
 ." /><label for='viewsummaryall'>".$clang->gT("View summary of all available fields")."</label></font></td></tr>\n"
 ."\t\t<tr><td align='center' bgcolor='#CCCCCC'>\n\t\t\t<br />\n"
 ."\t\t\t<input type='submit' value='".$clang->gT("View Stats")."' />\n"
diff --git a/admin/styles/default/adminstyle.css b/admin/styles/default/adminstyle.css
index f40a34cb7ba..3c3a6f8dddc 100644
--- a/admin/styles/default/adminstyle.css
+++ b/admin/styles/default/adminstyle.css
@@ -92,6 +92,12 @@ td {
 	color: #999;
 	font-size: 11px;
 }
+.checkboxbtn {
+	background-color: #BBBBBB;
+}
+.radiobtn {
+	background-color: #BBBBBB;
+}
 input, select {
 	color: #000080;
 	background: #EEEFFF;
diff --git a/admin/templates.php b/admin/templates.php
index b3a6b6e89dd..717c2ed9e6d 100644
--- a/admin/templates.php
+++ b/admin/templates.php
@@ -260,7 +260,7 @@
 	
 		$question="How many roads must a man walk down?";
 		$questioncode="1a";
-		$answer="<input type='radio' name='1' value='1' id='radio1' /><label class='answertext' for='radio1'>One</label><br /><input type='radio' name='1' value='2' id='radio2' /><label class='answertext' for='radio2'>Two</label><br /><input type='radio' name='1' value='3' id='radio3' /><label class='answertext' for='radio3'>Three</label><br />\n";
+		$answer="<input type='radio' class='radiobtn' name='1' value='1' id='radio1' /><label class='answertext' for='radio1'>One</label><br /><input type='radio' class='radiobtn' name='1' value='2' id='radio2' /><label class='answertext' for='radio2'>Two</label><br /><input type='radio' class='radiobtn' name='1' value='3' id='radio3' /><label class='answertext' for='radio3'>Three</label><br />\n";
 		$myoutput = array_merge($myoutput, doreplacement("$publicdir/templates/$templatename/question.pstpl"));
 	
 		$question="Please explain your details:";
diff --git a/admin/userrighthandling.php b/admin/userrighthandling.php
index 0820951c159..cb064db243c 100644
--- a/admin/userrighthandling.php
+++ b/admin/userrighthandling.php
@@ -220,49 +220,49 @@
 				."<form action='$scriptname' method='post'>\n";
 				//content
 				if($parent['create_survey']) {
-					$usersummary .= "\t\t<td align='center'><input type=\"checkbox\" name=\"create_survey\" value=\"create_survey\"";
+					$usersummary .= "\t\t<td align='center'><input type=\"checkbox\"  class=\"checkboxbtn\" name=\"create_survey\" value=\"create_survey\"";
 					if($usr['create_survey']) {
 						$usersummary .= " checked ";
 					}
 					$usersummary .=" /></td>\n";
 				}
 				if($parent['configurator']) {
-					$usersummary .= "\t\t<td align='center'><input type=\"checkbox\" name=\"configurator\" value=\"configurator\"";
+					$usersummary .= "\t\t<td align='center'><input type=\"checkbox\"  class=\"checkboxbtn\" name=\"configurator\" value=\"configurator\"";
 					if($usr['configurator']) {
 						$usersummary .= " checked ";
 					}
 					$usersummary .=" /></td>\n";
 				}
 				if($parent['create_user']) {
-					$usersummary .= "\t\t<td align='center'><input type=\"checkbox\" name=\"create_user\" value=\"create_user\"";
+					$usersummary .= "\t\t<td align='center'><input type=\"checkbox\"  class=\"checkboxbtn\" name=\"create_user\" value=\"create_user\"";
 					if($usr['create_user']) {
 						$usersummary .= " checked ";
 					}
 					$usersummary .=" /></td>\n";
 				}
 				if($parent['delete_user']) {
-					$usersummary .= "\t\t<td align='center'><input type=\"checkbox\" name=\"delete_user\" value=\"delete_user\"";
+					$usersummary .= "\t\t<td align='center'><input type=\"checkbox\"  class=\"checkboxbtn\" name=\"delete_user\" value=\"delete_user\"";
 					if($usr['delete_user']) {
 						$usersummary .= " checked ";
 					}
 					$usersummary .=" /></td>\n";
 				}
 				if($parent['move_user']) {
-					$usersummary .= "\t\t<td align='center'><input type=\"checkbox\" name=\"move_user\" value=\"move_user\"";
+					$usersummary .= "\t\t<td align='center'><input type=\"checkbox\"  class=\"checkboxbtn\" name=\"move_user\" value=\"move_user\"";
 					if($usr['move_user']) {
 						$usersummary .= " checked ";
 					}
 					$usersummary .=" /></td>\n";
 				}
 				if($parent['manage_template']) {
-					$usersummary .= "\t\t<td align='center'><input type=\"checkbox\" name=\"manage_template\" value=\"manage_template\"";
+					$usersummary .= "\t\t<td align='center'><input type=\"checkbox\"  class=\"checkboxbtn\" name=\"manage_template\" value=\"manage_template\"";
 					if($usr['manage_template']) {
 						$usersummary .= " checked ";
 					}
 					$usersummary .=" /></td>\n";
 				}
 				if($parent['manage_label']) {
-					$usersummary .= "\t\t<td align='center'><input type=\"checkbox\" name=\"manage_label\" value=\"manage_label\"";
+					$usersummary .= "\t\t<td align='center'><input type=\"checkbox\"  class=\"checkboxbtn\" name=\"manage_label\" value=\"manage_label\"";
 					if($usr['manage_label']) {
 						$usersummary .= " checked ";
 					}
@@ -545,7 +545,7 @@
 	. "\t\t<td align='right' width='20%'><strong>".$clang->gT("To:")."</strong></td>\n"
 	. "\t\t<td><input type='text' size='50' name='to' value=\"{$to}\" /></td></tr>\n"
 	. "\t\t<td align='right' width='20%'><strong>".$clang->gT("Send me a copy:")."</strong></td>\n"
-	. "\t\t<td><input name='copymail' type='checkbox' value='1' /></td></tr>\n"
+	. "\t\t<td><input name='copymail' type='checkbox' class='checkboxbtn' value='1' /></td></tr>\n"
 	. "\t\t<td align='right' width='20%'><strong>".$clang->gT("Subject:")."</strong></td>\n"
 	. "\t\t<td><input type='text' size='50' name='subject' value='' /></td></tr>\n"
 	. "\t<tr><td align='right'><strong>".$clang->gT("Message:")."</strong></td>\n"