diff --git a/app/contacts/contact_import.php b/app/contacts/contact_import.php
index c4f8cb68f8..4b188dff1b 100644
--- a/app/contacts/contact_import.php
+++ b/app/contacts/contact_import.php
@@ -408,7 +408,7 @@ else {
 	echo "			".$text['label-import_file_upload'].":\n";
 	echo "</td>\n";
 	echo "<td class='vtable' align='left'>\n";
-	echo "			<input name=\"ulfile\" type=\"file\" class=\"formfld\" id=\"ulfile\">\n";
+	echo "			<input name=\"ulfile\" type=\"file\" class=\"formfld fileinput\" id=\"ulfile\">\n";
 	echo "<br />\n";
 	//echo "Select the enclosure.\n";
 	echo "</td>\n";
diff --git a/app/fax/fax_view.php b/app/fax/fax_view.php
index 8821568415..47b9b00826 100644
--- a/app/fax/fax_view.php
+++ b/app/fax/fax_view.php
@@ -450,7 +450,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=\"formfld\" id=\"fax_file\" accept=\"image/tiff,application/pdf\">\n";
+	echo "	<input name=\"fax_file\" type=\"file\" class=\"formfld fileinput\" id=\"fax_file\" accept=\"image/tiff,application/pdf\">\n";
 	echo "	<br />\n";
 	echo "	".$text['description-upload']."\n";
 	echo "</td>\n";
diff --git a/app/music_on_hold/music_on_hold.php b/app/music_on_hold/music_on_hold.php
index b3ed4ae1b6..b4dc637e01 100644
--- a/app/music_on_hold/music_on_hold.php
+++ b/app/music_on_hold/music_on_hold.php
@@ -257,7 +257,7 @@ if ($_GET['act'] == "del" && permission_exists('music_on_hold_delete')) {
 		echo "	<tr>\n";
 		echo "		<td width='100%' style='padding-right: 5px;' nowrap>\n";
 		echo "			".$text['label-file-path']."<br>\n";
-		echo "			<input name='upload_file' type='file' class='formfld' style='width: 85%; margin-right: 3px;' id='upload_file'><input type='button' class='btn' value='".$text['button-clear']."' onclick=\"reset_file_input('upload_file');\">\n";
+		echo "			<input name='upload_file' type='file' class='formfld fileinput' style='width: 85%; margin-right: 3px;' id='upload_file'><input type='button' class='btn' value='".$text['button-clear']."' onclick=\"reset_file_input('upload_file');\">\n";
 		echo "		</td>\n";
 		echo "		<td style='padding-right: 5px;' nowrap>".$text['label-sampling']."<br>\n";
 		echo "			<select id='upload_sampling_rate' name='upload_sampling_rate' class='formfld' style='width: auto;'>\n";
diff --git a/app/recordings/recordings.php b/app/recordings/recordings.php
index 423b951547..f6e7b4c27d 100644
--- a/app/recordings/recordings.php
+++ b/app/recordings/recordings.php
@@ -183,7 +183,7 @@ require_once "resources/check_auth.php";
 		echo "			<form action=\"\" method=\"POST\" enctype=\"multipart/form-data\" name=\"frmUpload\" onSubmit=\"\">\n";
 		echo "			<input name=\"type\" type=\"hidden\" value=\"rec\">\n";
 		echo "			".$text['label-upload']."\n";
-		echo "			<input name=\"ulfile\" type=\"file\" class=\"formfld\" style=\"width: 260px;\" id=\"ulfile\">\n";
+		echo "			<input name=\"ulfile\" type=\"file\" class=\"formfld fileinput\" style=\"width: 260px;\" id=\"ulfile\">\n";
 		echo "			<input name=\"submit\" type=\"submit\"  class=\"btn\" id=\"upload\" value=\"".$text['button-upload']."\">\n";
 		echo "			</form>";
 		echo "		</td>\n";
diff --git a/app/schemas/schema_data_edit.php b/app/schemas/schema_data_edit.php
index 518d51acbb..81b4447e1d 100644
--- a/app/schemas/schema_data_edit.php
+++ b/app/schemas/schema_data_edit.php
@@ -841,7 +841,7 @@ else {
 								echo "<td valign='top' align='left' class='vtable'>\n";
 								echo "<script type=\"text/javascript\">\n";
 								echo $row['field_name']." = \"\<input type=\'hidden\' name=\'".$x."field_name\' value=\'".$row['field_name']."\'>\\n\";\n";
-								echo $row['field_name']." += \"\<input tabindex='".$row['field_order_tab']."' class=\'txt\' type=\'file\' name='".$x."field_value\' value=\'".$data_row[$row['field_name']]."\'>\\n\";\n";
+								echo $row['field_name']." += \"\<input tabindex='".$row['field_order_tab']."' class=\'formfld fileinput\' type=\'file\' name='".$x."field_value\' value=\'".$data_row[$row['field_name']]."\'>\\n\";\n";
 								echo "</script>\n";
 
 								echo "<div id='".$row['field_name']."id'>";
@@ -873,7 +873,7 @@ else {
 							else {
 								echo "<td valign='top' align='left' class='vtable'>\n";
 								echo "<input type='hidden' name='".$x."field_name' value='".$row['field_name']."'>\n";
-								echo "<input tabindex='".$row['field_order_tab']."' class='formfld' style='width:90%'  type='file' name='".$x."field_value' value=\"".$data_row[$row['field_name']]."\">\n";
+								echo "<input tabindex='".$row['field_order_tab']."' class='formfld fileinput' style='width:90%'  type='file' name='".$x."field_value' value=\"".$data_row[$row['field_name']]."\">\n";
 								echo "</td>\n";
 							}
 							break;
@@ -882,7 +882,7 @@ else {
 								echo "<td valign='top' align='left' class='vtable'>\n";
 								echo "<script type=\"text/javascript\">\n";
 								echo $row['field_name']." = \"<input type='hidden' name='".$x."field_name' value='".$row['field_name']."'>\";\n";
-								echo $row['field_name']." += \"<input tabindex='".$row['field_order_tab']."' class='formfld' style='width:90%'  type='file' name='".$x."field_value' value='".$data_row[$row['field_name']]."'>\";\n";
+								echo $row['field_name']." += \"<input tabindex='".$row['field_order_tab']."' class='formfld fileinput' style='width:90%'  type='file' name='".$x."field_value' value='".$data_row[$row['field_name']]."'>\";\n";
 								echo "</script>\n";
 
 								echo "<span id='".$row['field_name']."'>";
@@ -902,7 +902,7 @@ else {
 							else {
 								echo "<td valign='top' align='left' class='vtable'>\n";
 								echo "<input type='hidden' name='".$x."field_name' value='".$row['field_name']."'>\n";
-								echo "<input tabindex='".$row['field_order_tab']."' class='formfld' style='width:90%'  type='file' name='".$x."field_value' value=\"".$data_row[$row['field_name']]."\">\n";
+								echo "<input tabindex='".$row['field_order_tab']."' class='formfld fileinput' style='width:90%'  type='file' name='".$x."field_value' value=\"".$data_row[$row['field_name']]."\">\n";
 								echo "</td>\n";
 							}
 
diff --git a/app/voicemail_greetings/voicemail_greetings.php b/app/voicemail_greetings/voicemail_greetings.php
index 3bdf03fb29..aaba9800d2 100644
--- a/app/voicemail_greetings/voicemail_greetings.php
+++ b/app/voicemail_greetings/voicemail_greetings.php
@@ -235,7 +235,7 @@ else {
 	if (permission_exists('voicemail_greeting_upload')) {
 		echo "	<td align='right' nowrap>\n";
 		echo "		<input type='button' class='btn' name='' alt='back' onclick=\"javascript:history.back();\" value='".$text['button-back']."'>&nbsp;&nbsp;&nbsp;&nbsp;&nbsp;\n";
-		echo "		<input name=\"file\" type=\"file\" class=\"formfld\" id=\"file\">\n";
+		echo "		<input name=\"file\" type=\"file\" class=\"formfld fileinput\" id=\"file\">\n";
 		echo "		<input name=\"type\" type=\"hidden\" value=\"rec\">\n";
 		echo "		<input name=\"submit\" type=\"submit\" class=\"btn\" id=\"upload\" value=\"".$text['button-upload']."\">\n";
 		echo "	</td>\n";
diff --git a/themes/enhanced/template.php b/themes/enhanced/template.php
index 317f29ec45..29d98c084b 100644
--- a/themes/enhanced/template.php
+++ b/themes/enhanced/template.php
@@ -326,6 +326,10 @@ input[type=text]::-ms-clear {
     display: none;
 }
 
+input.fileinput {
+	padding: 1px;
+	}
+
 .vncell {
 	border-bottom: 1px solid #fff;
 	background-color: #e5e9f0;