diff --git a/admin/css/apps.css b/admin/css/apps.css
index fa4dfe9f61..c6b4f69ebc 100644
--- a/admin/css/apps.css
+++ b/admin/css/apps.css
@@ -7,4 +7,3 @@ table td.selection, table th.selection, table td.fileaction { width:2em; text-al
 table td.name a { padding:6px; text-decoration:none; color:#555555; }
 .type  { text-decoration:none; color:#888888; font-size:.8em; }
 .description  { text-decoration:none; color:#666666; font-size:.9em; }
-input[type="submit"].enabled { background:#aea; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; }
diff --git a/apps/media/templates/player.php b/apps/media/templates/player.php
index b307f98473..31b06e097b 100644
--- a/apps/media/templates/player.php
+++ b/apps/media/templates/player.php
@@ -19,4 +19,4 @@
 	<div class="jp-current-time"></div>
 	<div class="jp-duration"></div>
 	<div class='player' id='jp-player'></div>
-</div>
\ No newline at end of file
+</div>
diff --git a/core/css/styles.css b/core/css/styles.css
index e0f45e8b21..114080f1f1 100644
--- a/core/css/styles.css
+++ b/core/css/styles.css
@@ -22,7 +22,10 @@ input[type="checkbox"] { width:auto; }
 #body-login input { font-size:1.5em; }
 #body-login input[type="submit"] { float:right; margin-right:.8em; }
 #remember_login { margin:.8em .2em 0 1em; }
-form.searchbox input[type="search"] { position:fixed; font-size:1.2em; top:.3em; right:7em; padding:.2em .5em .2em 1.5em; background:#f8f8f8 url('../img/actions/search.png') .5em center no-repeat; border:0; -moz-border-radius:1em; -webkit-border-radius:1em; border-radius:1em; }
+form.searchbox input[type="search"] { position:fixed; font-size:1.2em; top:.3em; right:7em; padding:.2em .5em .2em 1.5em; background:#f8f8f8 url('../img/actions/search.png') .5em center no-repeat; border:0; -moz-border-radius:1em; -webkit-border-
+radius:1em; border-radius:1em; }
+input[type="submit"].enabled { background:#aea; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #cfc inset; }
+input[type="submit"].highlight{ background:#ffc100; border:1px solid #dda600; text-shadow:#ffeedd 0 1px 0; -moz-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; -webkit-box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; box-shadow:0 1px 1px #f8f8f8, 0 1px 1px #ffeedd inset; }
 
 form#user_settings { max-width:600px; }
 form#user_settings p label { display:block; float:left; width:35%; padding:0.4em 0.5em 0 0; text-align:right; }
diff --git a/files/css/files.css b/files/css/files.css
index 17ca1303a9..004e42338f 100644
--- a/files/css/files.css
+++ b/files/css/files.css
@@ -1,18 +1,16 @@
 /* FILE MENU */
-.actions { padding:.6em; float:right; margin-right:16em; }
+.actions { padding:.6em; float:right; margin-right:13em; }
 .actions input { margin:0; padding:.3em; }
-.actions .file_upload_form input { padding-left:2em; }
-#file_menu { right:0px; position:absolute; top:0; }
+#file_menu { right:0; position:absolute; top:0; }
 #file_menu a { display:block; float:left; background-image:none; text-decoration:none; }
 .file_upload_form, #file_newfolder_form { display:inline; }
 #fileSelector, #file_upload_submit, #file_newfolder_submit { display:none; }
-.file_upload_filename, #file_newfolder_name { background-repeat:no-repeat; background-position:0.5em 0; padding-left:2em; }
-.file_upload_filename { background-image:url("../img/file.png"); font-weight:bold; }.file_upload_start { opacity:0;filter:alpha(opacity = 0); }
-input.highlight{ background-color:#ffc100; border:#dda600 1px solid; }
+.file_upload_wrapper, #file_newfolder_name { background-repeat:no-repeat; background-position:.5em .3em; padding-left:2em; }
+.file_upload_wrapper { background:url("../img/file.png"); font-weight:bold; position:relative; top:-1.2em; left:-2em; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; width:8em; }
+.file_upload_start { opacity:0; filter:alpha(opacity=0); }
 
 #file_newfolder_name { background-image:url("../img/folder.png"); font-weight:bold; width:12em; }
-.file_upload_start, .file_upload_filename { position:absolute; top:0px; left:0px; width:12em; font-size:0.9em; }
-.file_upload_wrapper { position:relative; top:-1.2em; left:-2em; display:-moz-inline-box; /* fallback for older firefox versions*/ display:inline-block; width:12em; }
+.file_upload_start, .file_upload_filename { position:absolute; top:0; left:0; font-size:1em; }
 #file_newfolder_submit, #file_upload_submit { width:3em; }
 .file_upload_target { display:none; }
 
diff --git a/files/templates/index.php b/files/templates/index.php
index 3f7b45ca85..46d47ee4e8 100644
--- a/files/templates/index.php
+++ b/files/templates/index.php
@@ -4,17 +4,17 @@
 	</span>
 	<div class="actions">
 		<form data-upload-id='1' class="file_upload_form" action="ajax/upload.php" method="post" enctype="multipart/form-data" target="file_upload_target_1">
-			<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_["uploadMaxFilesize"] ?>" id="max_upload">
-			<input type="hidden" class="max_human_file_size" value="(max <?php echo $_["uploadMaxHumanFilesize"]; ?>)">
-			<input type="hidden" name="dir" value="<?php echo $_["dir"] ?>" id="dir">
-			<div class='file_upload_wrapper'>
-				<input class="prettybutton file_upload_filename" value="Upload (max. <?php echo $_["uploadMaxHumanFilesize"];?>)"/>
-				<input class="prettybutton file_upload_start" type="file" name='files[]'/>
-			</div>&nbsp;
+			<input type="hidden" name="MAX_FILE_SIZE" value="<?php echo $_['uploadMaxFilesize'] ?>" id="max_upload">
+			<input type="hidden" class="max_human_file_size" value="(max <?php echo $_['uploadMaxHumanFilesize']; ?>)">
+			<input type="hidden" name="dir" value="<?php echo $_['dir'] ?>" id="dir">
+			<div class="file_upload_wrapper">
+				<input type="submit" class="file_upload_filename" value="Upload (max. <?php echo $_['uploadMaxHumanFilesize'];?>)"/>
+				<input class="file_upload_start" type="file" name='files[]'/>
+			</div>
 			<iframe name="file_upload_target_1" class='file_upload_target' src=""></iframe>
 		</form>
 		<form id="file_newfolder_form">
-			<input type="text" class="prettybutton" name="file_newfolder_name" id="file_newfolder_name" value="New Folder" />&nbsp;
+			<input type="text" name="file_newfolder_name" id="file_newfolder_name" value="" placeholder="New Folder" />
 		</form>
 	</div>
 	<div id="file_action_panel">