diff --git a/app/fax/fax.php b/app/fax/fax.php
index 40b6382348..4938625380 100644
--- a/app/fax/fax.php
+++ b/app/fax/fax.php
@@ -149,12 +149,12 @@ require_once "resources/paging.php";
 				echo "	<td valign='top' class='".$row_style[$c]."'>".$row['fax_extension']."</td>\n";
 				echo "	<td valign='top' class='".$row_style[$c]."'>".$row['fax_email']."&nbsp;</td>\n";
 				echo "	<td valign='top' class='row_stylebg' width='35%'>".$row['fax_description']."&nbsp;</td>\n";
-				echo "	<td valign='top' align='right'>\n";
+				echo "	<td class='list_control_icons'>";
 				if (permission_exists('fax_extension_edit')) {
-					echo "		<a href='fax_view.php?id=".$row['fax_uuid']."' alt='edit'>$v_link_label_edit</a>\n";
+					echo "<a href='fax_view.php?id=".$row['fax_uuid']."' alt='edit'>$v_link_label_edit</a>";
 				}
 				if (permission_exists('fax_extension_delete')) {
-					echo "		<a href='fax_delete.php?id=".$row['fax_uuid']."' alt='delete' onclick=\"return confirm('".$text['message-confirm-delete']."')\">$v_link_label_delete</a>\n";
+					echo "<a href='fax_delete.php?id=".$row['fax_uuid']."' alt='delete' onclick=\"return confirm('".$text['message-confirm-delete']."')\">$v_link_label_delete</a>";
 				}
 				echo "	</td>\n";
 				echo "</tr>\n";
@@ -170,9 +170,9 @@ require_once "resources/paging.php";
 	echo "	<tr>\n";
 	echo "		<td width='33.3%' nowrap>&nbsp;</td>\n";
 	echo "		<td width='33.3%' align='center' nowrap>$paging_controls</td>\n";
-	echo "		<td width='33.3%' align='right'>\n";
+	echo "		<td class='list_control_icons'>";
 	if (permission_exists('fax_extension_add')) {
-		echo "			<a href='fax_edit.php' alt='add'>$v_link_label_add</a>\n";
+		echo 		"<a href='fax_edit.php' alt='add'>$v_link_label_add</a>";
 	}
 	echo "		</td>\n";
 	echo "	</tr>\n";
diff --git a/app/fax/fax_edit.php b/app/fax/fax_edit.php
index 5568173f22..0ea98249cd 100644
--- a/app/fax/fax_edit.php
+++ b/app/fax/fax_edit.php
@@ -660,7 +660,7 @@ if (count($_POST)>0 && strlen($_POST["persistformvar"]) == 0) {
 			$sql .= "where domain_uuid = '".$_SESSION['domain_uuid']."' ";
 			$prep_statement = $db->prepare(check_sql($sql));
 			$prep_statement->execute();
-			echo "			<select name=\"user_uuid\" class='frm'>\n";
+			echo "			<select name=\"user_uuid\" class='formfld' style='width: auto;'>\n";
 			echo "			<option value=\"\"></option>\n";
 			$result = $prep_statement->fetchAll(PDO::FETCH_NAMED);
 			foreach($result as $field) {
diff --git a/app/fax/fax_view.php b/app/fax/fax_view.php
index 85598e231b..97b6209069 100644
--- a/app/fax/fax_view.php
+++ b/app/fax/fax_view.php
@@ -182,16 +182,16 @@ else {
 				mkdir($fax_dir.'/'.$fax_extension,0774,true);
 				chmod($fax_dir.'/'.$fax_extension,0774);
 			}
-			if (!is_dir($dir_fax_inbox)) { 
-				mkdir($dir_fax_inbox,0774,true); 
+			if (!is_dir($dir_fax_inbox)) {
+				mkdir($dir_fax_inbox,0774,true);
 				chmod($dir_fax_inbox,0774);
 			}
-			if (!is_dir($dir_fax_sent)) { 
-				mkdir($dir_fax_sent,0774,true); 
+			if (!is_dir($dir_fax_sent)) {
+				mkdir($dir_fax_sent,0774,true);
 				chmod($dir_fax_sent,0774);
 			}
-			if (!is_dir($dir_fax_temp)) { 
-				mkdir($dir_fax_temp,0774,true); 
+			if (!is_dir($dir_fax_temp)) {
+				mkdir($dir_fax_temp,0774,true);
 				chmod($dir_fax_temp,0774);
 			}
 	}
@@ -220,7 +220,7 @@ else {
 	}
 
 //clear file status cache
-	clearstatcache(); 
+	clearstatcache();
 
 //upload and send the fax
 	if (($_POST['type'] == "fax_send") && is_uploaded_file($_FILES['fax_file']['tmp_name'])) {
@@ -425,7 +425,7 @@ else {
 	echo "<td class='vtable' align='left'>\n";
 	echo "	<input name=\"id\" type=\"hidden\" value=\"\$id\">\n";
 	echo "	<input name=\"type\" type=\"hidden\" value=\"fax_send\">\n";
-	echo "	<input name=\"fax_file\" type=\"file\" class=\"btn\" id=\"fax_file\" accept=\"image/tiff,application/pdf\">\n";
+	echo "	<input name=\"fax_file\" type=\"file\" class=\"formfld\" id=\"fax_file\" accept=\"image/tiff,application/pdf\">\n";
 	echo "	<br />\n";
 	echo "	".$text['description-upload']."\n";
 	echo "</td>\n";