diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj b/src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj
index 67d25862f..a9afb457c 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Orchard.MediaPicker.csproj
@@ -58,9 +58,10 @@
     <Reference Include="System.Xml.Linq" />
   </ItemGroup>
   <ItemGroup>
-    <Content Include="Content\synchronizing.gif" />
     <Content Include="Scripts\MediaBrowser.js" />
     <Content Include="Scripts\MediaPicker.js" />
+    <Content Include="Styles\images\imagepreview.png" />
+    <Content Include="Styles\images\synchronizing.gif" />
     <Content Include="Styles\mediapicker.css" />
     <Content Include="Views\Web.config" />
     <Content Include="Scripts\Web.config" />
diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/images/imagepreview.png b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/images/imagepreview.png
new file mode 100644
index 000000000..27b080343
Binary files /dev/null and b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/images/imagepreview.png differ
diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Content/synchronizing.gif b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/images/synchronizing.gif
similarity index 100%
rename from src/Orchard.Web/Modules/Orchard.MediaPicker/Content/synchronizing.gif
rename to src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/images/synchronizing.gif
diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css
index db7f096dc..6a13c5043 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Styles/mediapicker.css
@@ -13,7 +13,7 @@ body {
 
 #orchardmediapicker * { font:100% normal Segoe UI,Trebuchet,Arial,Sans-Serif; }
 
-#orchardmediapicker #tabs { padding: 0 0 24px 0; }
+#orchardmediapicker #tabs { padding: 0 0 12px 0; }
 
 #orchardmediapicker a, #orchardmediapicker a:link, #orchardmediapicker a:visited, #orchardmediapicker a:hover, #orchardmediapicker a:active, #orchardmediapicker a:focus {
     color:#1e5d7d;
@@ -111,9 +111,11 @@ fieldset          { padding:0; margin: 0; border: 0px solid #dbdbdb; }
 #orchardmediapicker label.forcheckbox { display: inline; margin: 10px 0 0 4px; }
 #orchardmediapicker .actions { margin:12px 0 0 0; clear:both; text-align:left; }
 
+#orchardmediapicker .text-box {width:90%;}
+
 .image-width, .image-height {float:left; width:90px;}
 
-.image-width .text-box, .image-height .text-box {width:60%;}
+#orchardmediapicker .image-width .text-box, #orchardmediapicker .image-height .text-box, #orchardmediapicker #folderName {width:60%;}
 
 
 .clearboth {
diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml b/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml
index b456a51c4..75f0c505a 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Gallery.cshtml
@@ -27,8 +27,8 @@
             </p>
 			<fieldset>
 				<input id="__requesttoken" type="hidden" value="@Html.AntiForgeryTokenValueOrchard()" />
-				<input id="folderName" type="text" />
-				<input type="button" id="createFolder" value="@T("Create Folder")" />
+				<input class="text-box" id="folderName" type="text" />
+				<input class="button" type="button" id="createFolder" value="@T("Create Folder")" />
 			</fieldset>
         </div>
         <fieldset>
@@ -66,11 +66,10 @@
                 <input type="hidden" name="MediaPath" value="@Model.MediaPath" />
                 <label for="fileUpload">@T("Upload an image from your computer")</label>
                 <input type="file" name="fileUpload" id="fileUpload"  />
-                <input type="submit" id="upload" value="Upload" />
+                <input class="button" type="submit" id="upload" value="Upload" />
                 }
             }
-			<img id="lib-indicator" src="@Url.Content("~/modules/orchard.mediapicker/content/synchronizing.gif")" alt="" class="throbber" />
-
+            <img id="img-indicator" src="@Url.Content("~/modules/orchard.mediapicker/Styles/images/synchronizing.gif")" alt="" class="throbber" />
 
         </fieldset>
 
diff --git a/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Url.cshtml b/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Url.cshtml
index 5840aeb70..ae32d3d06 100644
--- a/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Url.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MediaPicker/Views/Admin/Tab_Url.cshtml
@@ -15,7 +15,7 @@
         <div id="image-preview">
             <img alt="" id="img-loader" style="display:none" src="" />
             <div class="media-largepreview">
-                <img alt="@T("Preview of Image")" id="img-preview" src="TODO: some placeholder image" onload="jQuery.mediaPicker.scalePreview(this)" />
+                <img alt="@T("Preview of Image")" id="img-preview" src="@Url.Content("~/modules/orchard.mediapicker/Styles/images/imagepreview.png")" onload="jQuery.mediaPicker.scalePreview(this)" />
             </div>
             <div>
                 <label for="img-src">@T("URL for the image resource")</label>
@@ -26,9 +26,9 @@
                     <input type="hidden" name="MediaPath" value="@mediaPath" />
                     <label for="fileUpload">@T("Upload an image from your computer")</label>
                     <input type="file" name="fileUpload" id="fileUpload"  />
-                    <input type="submit" id="upload" value="Upload" />
+                    <input class="button" type="submit" id="upload" value="Upload" />
                 }
-				<img id="img-indicator" src="@Url.Content("~/modules/orchard.mediapicker/content/synchronizing.gif")" alt="" class="throbber" />
+				<img id="img-indicator" src="@Url.Content("~/modules/orchard.mediapicker/Styles/images/synchronizing.gif")" alt="" class="throbber" />
             </div>
 
         </div>