diff --git a/web/index.html b/web/index.html
index 5893ec1a0..1fa14bf9e 100755
--- a/web/index.html
+++ b/web/index.html
@@ -193,40 +193,51 @@
 				<form id="prefs_form">
 					<div class="preference download_location">
 						<label class="category">Add transfers:</label>
-						<label class="item">Download to:</label>
-						<input type="text" name="download_location" id="download_location"/>
+						<div class="formdiv">
+							<label for="download_location" class="item">Download to:</label>
+							<input type="text" name="download_location" id="download_location"/>
+						</div>
+						<div class="formdiv checkbox auto_start">
+							<input type="checkbox" name="auto_start" id="auto_start"/>
+							<label for="auto_start" class="item">Start transfers when added</label>
+						</div>
 					</div>
 					<div class="preference port">
 						<label class="category">Network:</label>
-						<label class="item">Incoming TCP Port:</label>
-						<input type="text" id="port" name="port"/>
-					</div>
-					<div class="preference auto_start">
-						<label class="category">Transfers:</label>
-						<input type="checkbox" name="auto_start" id="auto_start"/>
-						<label class="item">Start transfers when added</label>
+						<div class="formdiv">
+							<label for="post" class="item">Incoming TCP Port:</label>
+							<input type="text" id="port" name="port"/>
+						</div>
 					</div>
 					<div class="preference encryption">
 						<label class="category">Encryption:</label>
-						<input type="checkbox" name="encryption" id="encryption"/>
-						<label class="item">Ignore unencrypted peers</label>
+						<div class="formdiv checkbox">
+							<input type="checkbox" name="encryption" id="encryption"/>
+							<label for="encryption" class="item">Ignore unencrypted peers</label>
+						</div>
 					</div>
 					<div class="preference limit_total">
 						<label class="category">Limit total bandwidth:</label>
-						<input type="checkbox" name="limit_download" id="limit_download"/>
-						<label class="item">Download Rate:</label>
-						<input type="text" name="download_rate" id="download_rate"/>
-						<label class="suffix">KB/s</label>
-						<input type="checkbox" name="limit_upload" id="limit_upload"/>
-						<label class="item">Upload Rate:</label>
-						<input type="text" name="upload_rate" id="upload_rate"/>
-						<label class="suffix">KB/s</label>
+						<div class="formdiv checkbox">
+							<input type="checkbox" name="limit_download" id="limit_download"/>
+							<label for="limit_download" class="item">Download Rate:</label>
+							<input type="text" name="download_rate" id="download_rate"/>
+							<label class="suffix">KB/s</label>
+						</div>
+						<div class="formdiv checkbox">
+							<input type="checkbox" name="limit_upload" id="limit_upload"/>
+							<label for="limit_upload" class="item">Upload Rate:</label>
+							<input type="text" name="upload_rate" id="upload_rate"/>
+							<label class="suffix">KB/s</label>
+						</div>
 					</div>
 					<div class="preference web_gui">
 						<label class="category">Web Client:</label>
-						<label class="item">Refresh Rate:</label>
-						<input type="text" name="refresh_rate" id="refresh_rate"/>
-						<label class="suffix">seconds</label>
+						<div class="formdiv">
+							<label for="refresh_rate" class="item">Refresh Rate:</label>
+							<input type="text" name="refresh_rate" id="refresh_rate"/>
+							<label class="suffix">seconds</label>
+						</div>
 					</div>
 					<a href="#save" id="prefs_save_button">Save</a>
 					<a href="#cancel" id="prefs_cancel_button">Cancel</a>
diff --git a/web/javascript/common.js b/web/javascript/common.js
index a2cbb4078..c9ef5cd31 100644
--- a/web/javascript/common.js
+++ b/web/javascript/common.js
@@ -69,11 +69,6 @@ $(document).ready( function() {
 		// different padding.
 		$('div.dialog_container div.dialog_window a').css('padding', '2px 10px 3px');
 	}
-	if ($.browser.mozilla) {
-		$('div#prefs_container div.preference input').css('height', 'auto');
-		$('div#prefs_container div.preference input').css('padding', '1px');
-		$('div#prefs_container div.preference input').css('margin-top', '2px');
-	}
 });
 
 /*
diff --git a/web/javascript/transmission.js b/web/javascript/transmission.js
index 9a9f3adb7..9774d80e1 100644
--- a/web/javascript/transmission.js
+++ b/web/javascript/transmission.js
@@ -171,7 +171,7 @@ Transmission.prototype =
 		});
 		if (!$.browser.safari)
 		{
-			$(this).addClass('blur');
+			search_box.addClass('blur');
 			search_box[0].value = 'Filter';
 			search_box.bind('blur', {transmission: this}, function(event) {
 				if (this.value == '') {
diff --git a/web/stylesheets/common.css b/web/stylesheets/common.css
index 3e659ac98..30f361a81 100644
--- a/web/stylesheets/common.css
+++ b/web/stylesheets/common.css
@@ -223,7 +223,7 @@ div.torrent_global_details div#torrent_global_upload {
 }
 
 div.torrent_global_details div#torrent_global_download {
-	background: url('../images/graphics/transfer_arrows.png') left 1px no-repeat;
+	background: url('../images/graphics/transfer_arrows.png') left 2px no-repeat;
 }
 
 /*--------------------------------------
@@ -313,10 +313,23 @@ div#torrent_filter_bar input#torrent_search {
 	height: 15px;
 	width: 100px;
 	border: solid 0 #fff;
-	padding-left: 2px;
-	padding-right: 2px;
+	padding: 0 2px;
 	margin: 4px 5px 0 0;
 }
+/* Safari-look filter input for Firefox */
+@-moz-document url-prefix() {
+	div#torrent_filter_bar input#torrent_search {
+		background: #FFF url('../images/graphics/filter_icon.png') top left no-repeat;
+		border: 1px solid #5D80A1;
+		margin-top: 3px;
+		padding: 1px 10px 1px 18px;
+		width: 76px;
+		-moz-border-radius: 10px;
+	}
+	div#torrent_filter_bar input#torrent_search.blur {
+		border-color: #CCC;
+	}
+} 
 
 div#torrent_filter_bar input#torrent_search.blur {
 	color: #999;
@@ -754,16 +767,7 @@ div#prefs_container label.suffix {
 	float: left;
 }
 
-div#prefs_container div.download_location label.item,
-div#prefs_container div.port label.item,
-div#prefs_container div.web_gui label.item {
-	width: 112px;
-	clear: left;
-}
-
-div#prefs_container div.auto_start label.item,
-div#prefs_container div.encryption label.item,
-div#prefs_container div.limit_total label.item {
+div#prefs_container div.formdiv.checkbox label.item {
 	margin: 0 5px 0 41px;
 	clear: left;
 }
@@ -779,6 +783,11 @@ div#prefs_container div.preference input[type=checkbox] {
 	z-index: 99;
 	left: 14px;
 }
+@-moz-document url-prefix() {
+	div#prefs_container div.preference input[type=checkbox] {
+		margin-top: 5px;
+	}
+}
 
 div#prefs_container div.preference input[type=text] {
 	width: 50px;
@@ -791,14 +800,14 @@ div#prefs_container div.preference input {
 	float: left;
 }
 
-div#prefs_container div.preference input#limit_upload {
-	margin-top: 33px !important;
-}
-
 div#prefs_container div.download_location input {
 	width: 256px !important;
 }
 
+div#prefs_container div.formdiv {
+	clear: both;
+}
+
 div#prefs_container a {
 	clear: left;
 	margin: 10px 5px 10px 7px;