diff --git a/usr/local/www/guiconfig.inc b/usr/local/www/guiconfig.inc
index 4ce39b3ce6..7209d9e8f8 100755
--- a/usr/local/www/guiconfig.inc
+++ b/usr/local/www/guiconfig.inc
@@ -289,30 +289,47 @@ function verify_gzip_file($fname) {
 
 function print_info_box_np($msg, $name="apply",$value="Apply changes") {
 	global $g;
-	echo "<table height=\"32\" width=\"100%\">\n";
-	echo "  <tr>\n";
-	echo "   <td>\n";
-	echo "      <div style='background-color:#990000' id='redbox'>\n";
-	echo "       <table width='100%'><tr><td width='8%'>\n";
-	echo "        &nbsp;&nbsp;&nbsp;<img style='vertical-align:middle' src=\"/themes/".$g['theme']."/images/icons/icon_exclam.gif\" width=\"28\" height=\"32\">\n";
-	echo "        </td>\n";
-	echo "        <td width='70%'><font color='white'><b>{$msg}</b></font>\n";
-	echo "        </td>";
-	if(stristr($msg, "apply") == true || stristr($msg, "save") || stristr($msg, "create")) {
-		echo "         <td>";
-		echo "           <input name=\"{$name}\" type=\"submit\" class=\"formbtn\" id=\"${name}\" value=\"{$value}\">\n";
-		echo "         </td>";
+	
+	if(stristr($msg, "apply") == true || stristr($msg, "save") || stristr($msg, "create")) 
+		$savebutton="<td><input name=\"{$name}\" type=\"submit\" class=\"formbtn\" id=\"${name}\" value=\"{$value}\"></td>";
+
+	$nifty_redbox = "#990000";
+	$nifty_blackbox = "#000000";
+	
+	$themename = $g['theme'];
+	
+	if(file_exists("/usr/local/www/themes/{$themename}/tabcontrols.php")) {
+		$toeval = file_get_contents("/usr/local/www/themes/{$themename}/tabcontrols.php");
+		eval($toeval);
 	}
-	echo "        </tr></table>\n";
-	echo "       </div>\n";
-	echo "    </td>\n";
-	echo "</table>\n";
-	echo "<script type=\"text/javascript\">\n";
-	echo "NiftyCheck();\n";
-	echo "Rounded(\"div#redbox\",\"all\",\"#FFF\",\"#990000\",\"smooth\");\n";
-	echo "Rounded(\"td#blackbox\",\"all\",\"#FFF\",\"#000000\",\"smooth\");\n";
-	echo "</script>\n";
-	echo "\n<br>\n";
+		
+	echo <<<EOFnp
+	<table id='infoboxnptable'>
+		<tr>
+			<td>
+				<div style='infoboxnp' id='redbox'>
+					<table id='infoboxnptable2'>
+						<tr>
+							<td id='infoboxnptd'>
+								&nbsp;&nbsp;&nbsp;<img style='infoboxnpimg' src="/themes/{$g['theme']}/images/icons/icon_exclam.gif" >
+							</td>
+							<td id='infoboxnptd2'>
+								<b>{$msg}</b></font>
+							</td>
+							{$savebutton}
+						</tr>
+					</table>
+				</div>
+			</td>
+		</tr>
+	</table>
+	<script type="text/javascript">
+		NiftyCheck();
+		Rounded("div#redbox","all","#FFF","{$nifty_redbox}","smooth");
+		Rounded("td#blackbox","all","#FFF","{$nifty_blackbox}","smooth");
+	</script>
+EOFnp;
+
 }
 
 function print_info_box($msg) {
diff --git a/usr/local/www/themes/metallic/all.css b/usr/local/www/themes/metallic/all.css
index 6c943f6b03..2299838c9a 100644
--- a/usr/local/www/themes/metallic/all.css
+++ b/usr/local/www/themes/metallic/all.css
@@ -4,6 +4,35 @@ html, body, td, th, input, select {
 	font-size: 0.9em;
 }
 
+.infoboxnptd2 {
+	width:70%;
+	font-color:white;
+}
+
+.infoboxnptd {
+	width:8%;
+}
+
+.infoboxnptable {
+ 	height:32px;
+	width:100%;
+}
+
+.infoboxnptable2 {
+ 	height:32px;
+	width:100%;
+}
+
+.infoboxnp {
+	background-color:#990000;
+}
+
+.infoboxnpimg {
+	vertical-align:middle;
+	width:28px;
+	height:32px;
+}
+
 .inputerrorsleft {
 	background-color: #990000;
 	width: 36px;
diff --git a/usr/local/www/themes/nervecenter/all.css b/usr/local/www/themes/nervecenter/all.css
index 03bbbde748..1a09241a17 100644
--- a/usr/local/www/themes/nervecenter/all.css
+++ b/usr/local/www/themes/nervecenter/all.css
@@ -5,6 +5,35 @@ html, body, td, th, input, select {
 
 }
 
+.infoboxnptd2 {
+	width:70%;
+	font-color:white;
+}
+
+.infoboxnptd {
+	width:8%;
+}
+
+.infoboxnptable {
+ 	height:32px;
+	width:100%;
+}
+
+.infoboxnptable2 {
+ 	height:32px;
+	width:100%;
+}
+
+.infoboxnp {
+	background-color:#990000;
+}
+
+.infoboxnpimg {
+	vertical-align:middle;
+	width:28px;
+	height:32px;
+}
+
 .inputerrorsleft {
 	background-color: #990000;
 	width: 36px;
diff --git a/usr/local/www/themes/pfsense-dropdown/all.css b/usr/local/www/themes/pfsense-dropdown/all.css
index 0af7a3a002..1692d503bb 100644
--- a/usr/local/www/themes/pfsense-dropdown/all.css
+++ b/usr/local/www/themes/pfsense-dropdown/all.css
@@ -4,6 +4,35 @@ html, body, td, th, input, select {
 	font-size: 0.9em;
 }
 
+.infoboxnptd2 {
+	width:70%;
+	font-color:white;
+}
+
+.infoboxnptd {
+	width:8%;
+}
+
+.infoboxnptable {
+ 	height:32px;
+	width:100%;
+}
+
+.infoboxnptable2 {
+ 	height:32px;
+	width:100%;
+}
+
+.infoboxnp {
+	background-color:#990000;
+}
+
+.infoboxnpimg {
+	vertical-align:middle;
+	width:28px;
+	height:32px;
+}
+
 .inputerrorsleft {
 	background-color: #990000;
 	width: 36px;
diff --git a/usr/local/www/themes/pfsense/all.css b/usr/local/www/themes/pfsense/all.css
index 13aa29e788..7f2b055838 100644
--- a/usr/local/www/themes/pfsense/all.css
+++ b/usr/local/www/themes/pfsense/all.css
@@ -4,6 +4,35 @@ html, body, td, th, input, select {
 	font-size: 0.9em;
 }
 
+.infoboxnptd2 {
+	width:70%;
+	font-color:white;
+}
+
+.infoboxnptd {
+	width:8%;
+}
+
+.infoboxnptable {
+ 	height:32px;
+	width:100%;
+}
+
+.infoboxnptable2 {
+ 	height:32px;
+	width:100%;
+}
+
+.infoboxnp {
+	background-color:#990000;
+}
+
+.infoboxnpimg {
+	vertical-align:middle;
+	width:28px;
+	height:32px;
+}
+
 .inputerrorsleft {
 	background-color: #990000;
 	width: 36px;
diff --git a/usr/local/www/themes/the_wall/all.css b/usr/local/www/themes/the_wall/all.css
index 8653aae75d..0c514c1960 100644
--- a/usr/local/www/themes/the_wall/all.css
+++ b/usr/local/www/themes/the_wall/all.css
@@ -5,6 +5,35 @@ html, body, td, th, input, select {
 
 }
 
+.infoboxnptd2 {
+	width:70%;
+	font-color:white;
+}
+
+.infoboxnptd {
+	width:8%;
+}
+
+.infoboxnptable {
+ 	height:32px;
+	width:100%;
+}
+
+.infoboxnptable2 {
+ 	height:32px;
+	width:100%;
+}
+
+.infoboxnp {
+	background-color:#990000;
+}
+
+.infoboxnpimg {
+	vertical-align:middle;
+	width:28px;
+	height:32px;
+}
+
 .inputerrorsleft {
 	background-color: #990000;
 	width: 36px;