diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Scripts/base.js b/src/Orchard.Web/Modules/Orchard.Themes/Scripts/base.js
index 916f30533..80c3331fc 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Scripts/base.js
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Scripts/base.js
@@ -50,10 +50,10 @@ jQuery.fn.extend({
 (function() {
     $("form.inline.link").each(function() {
         var _this = $(this);
-        var link = $("<a href='.'/>");
+        var link = $("<a class='wasFormInlineLink' href='.'/>");
         var button = _this.children("button").first();
         link.text(button.text())
-            .css("cursor", "pointer")
+            .addClass(button.attr("class"))
             .click(function() { _this.submit(); return false; })
             .unload(function() { _this = 0; });
         _this.replaceWith(link);
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx
index 163668ec2..618845880 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Index.aspx
@@ -27,33 +27,24 @@
       <div>
         <h3><%=Html.Encode(theme.DisplayName) %></h3>
         <%=Html.Image(Html.ThemePath(theme, "/Theme.png"), Html.Encode(theme.DisplayName), null)%>
-        
-            <% using (Html.BeginFormAntiForgeryPost(Url.Action("Activate"), FormMethod.Post, new { @class = "inline" }))
-               { %>
-                <fieldset>
-                    <button type="submit" title="<%=_Encoded("Activate") %>" name="themeName" value="<%=theme.ThemeName %>"><%=_Encoded("Activate") %></button>
-                </fieldset>
-            <% } %>
-            <% using (Html.BeginFormAntiForgeryPost(Url.Action("Preview"), FormMethod.Post, new { @class = "inline" }))
-               { %>
-                <fieldset>
-                    <button type="submit" title="<%=_Encoded("Preview") %>" name="themeName" value="<%=theme.ThemeName %>"><%=_Encoded("Preview") %></button>
-                </fieldset>
-            <% } %>
-
+        <% using (Html.BeginFormAntiForgeryPost(Url.Action("Activate"), FormMethod.Post, new { @class = "inline" })) { %>
+            <%=Html.Hidden("themeName", theme.ThemeName)%>
+            <button type="submit" title="<%=_Encoded("Activate") %>"><%=_Encoded("Activate") %></button>
+        <% } %>
+        <% using (Html.BeginFormAntiForgeryPost(Url.Action("Preview"), FormMethod.Post, new { @class = "inline" })) { %>
+            <%=Html.Hidden("themeName", theme.ThemeName)%>
+            <button type="submit" title="<%=_Encoded("Preview") %>"><%=_Encoded("Preview") %></button>
+        <% } %>
         <h5><%=_Encoded("By") %> <%=Html.Encode(theme.Author) %></h5>
         <p>
             <%=_Encoded("Version:") %> <%=Html.Encode(theme.Version) %><br />
             <%=Html.Encode(theme.Description) %><br />
             <%=Html.Encode(theme.HomePage) %>
         </p>
-                <% using (Html.BeginFormAntiForgeryPost(Url.Action("Uninstall"), FormMethod.Post, new { @class = "inline" }))
-               { %>
-                <fieldset>
-                    <button type="submit" class="linkButton" title="<%=_Encoded("Uninstall") %>" name="themeName" value="<%=theme.ThemeName %>"><%=_Encoded("Uninstall")%></button>
-                </fieldset>
-            <% } %>
-
+        <% using (Html.BeginFormAntiForgeryPost(Url.Action("Uninstall"), FormMethod.Post, new { @class = "inline link" })) { %>
+            <%=Html.Hidden("themeName", theme.ThemeName)%>
+           <button type="submit" class="uninstall" title="<%=_Encoded("Uninstall") %>"><%=_Encoded("Uninstall")%></button>
+        <% } %>
      </div>   
     </li>
     <% }
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/ThemePreview.ascx b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/ThemePreview.ascx
index 3c99b76eb..2bda1888a 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/ThemePreview.ascx
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/ThemePreview.ascx
@@ -2,37 +2,68 @@
 <%@ Import Namespace="Orchard.Mvc.Html"%>
 <%@ Import Namespace="Orchard.Themes.ViewModels"%>
 <style type="text/css">
-#themepreview, #themepreview fieldset, #themepreview input, #themepreview select 
-{
-    margin: 0; padding: 0; border:none; font-size: 1em; width:auto; color: #000;
-    font-family:Frutiger,"Frutiger Linotype",Univers,Calibri,"Gill Sans","Gill Sans MT","Myriad Pro",Myriad,"DejaVu Sans Condensed","Liberation Sans","Nimbus Sans L",Tahoma,Geneva,"Helvetica Neue",Helvetica,Arial,sans-serif;
+body {
+    margin-top:40px;
 }
-/*#themepreview { background: #000; font-size:15px; padding:5px; }*/
-#themepreview span { color: #ccc; padding-right:5px;  }
-#themepreview fieldset {  margin: 0; padding: 3px; }
-/*#themepreview button { font-size: 13px; padding:0 3px; margin-left:10px; }*/
-#themepreview button.preview { margin-left:0; }
+#themepreview {
+    background:#2D2F25 url('<%=ResolveUrl("../../Styles/Images/toolBarBackground.gif") %>') repeat-x left top;
+    border-bottom:1px solid #494d4d;
+    font-size:15px; 
+    left:0;
+    height:30px;
+    margin:0;
+    position:absolute;
+    overflow:hidden;
+    padding:5px 0;
+    top:0;
+    width:100%;
+}   
+#themepreview fieldset,
+#themepreview span, #themepreview input,
+#themepreview select, #themepreview button  {
+    border:none;
+    color:#000;
+    font:1em/1em Frutiger,"Frutiger Linotype",Univers,Calibri,"Gill Sans","Gill Sans MT","Myriad Pro",Myriad,"DejaVu Sans Condensed","Liberation Sans","Nimbus Sans L",Tahoma,Geneva,"Helvetica Neue",Helvetica,Arial,sans-serif;
+    margin:0;
+    padding:0;
+    width:auto;
+}
+#themepreview span { color: #ccc; padding-right:5px; }
+#themepreview fieldset { padding:3px 8px; }
 html.dyn #themepreview button.preview { display:none; }
+#themepreview fieldset * { float:left; }
+#themepreview fieldset span { line-height:1.6em; }
 #themepreview button.cancel { float:right; }
-
-#themepreview { background: #2D2F25 url('<%=ResolveUrl("../../Styles/Images/toolBarBackground.gif") %>') repeat-x left top; font-size:15px; padding:5px; border-bottom:1px solid #494d4d;}
-
 /* Button styles */
-#themepreview button { font-size: 13px; padding:2px 4px; margin: 0 0 0 10px; text-align:center; color:#f1f1f1; border:1px solid; border-top-color:#191d1d; border-right-color:#494d4d; border-bottom-color:#494d4d; border-left-color:#202626; background:#2a2626 url('<%=ResolveUrl("../../Styles/Images/toolBarActiveButtonBackground.gif") %>') repeat-x left center; }
-
-/* Hover for buttons */
-#themepreview button:hover { color:#fdcc64; border:1px #545959 solid; cursor:pointer; background:#2a2626 url('<%=ResolveUrl("../../Styles/Images/toolBarHoverButtonBackground.gif") %>') repeat-x left center; }
-
+#themepreview button {
+    background:#2a2626 url('<%=ResolveUrl("../../Styles/Images/toolBarActiveButtonBackground.gif") %>') repeat-x left center;
+    border:1px solid;
+    border-top-color:#191d1d;
+    border-right-color:#494d4d;
+    border-bottom-color:#494d4d;
+    border-left-color:#202626;
+    color:#f1f1f1;
+    line-height:1.22em;
+    margin: 0 0 0 10px;
+    padding:0 4px 1px;
+    text-align:center;
+}
+#themepreview button:hover {
+    background:#2a2626 url('<%=ResolveUrl("../../Styles/Images/toolBarHoverButtonBackground.gif") %>') repeat-x left center;
+    border-color:#545959;
+    color:#fdcc64;
+    cursor:pointer;
+}
 </style>
 <div id="themepreview">
 <% using(Html.BeginFormAntiForgeryPost(Url.Action("Preview", new{Controller="Admin", Area="Orchard.Themes"}), FormMethod.Post, new { @class = "inline" })) { %>
     <fieldset>    
         <span><%=T("You are previewing: ")%></span>
+        <%=Html.Hidden("ReturnUrl", Context.Request.Url)%>
         <%=Html.DropDownList("ThemeName", Model.Themes, new {onChange = "this.form.submit();"})%>
         <button type="submit" class="preview" title="<%=_Encoded("Preview")%>" name="submit.Preview" value="<%=_Encoded("Preview")%>"><%=_Encoded("Preview")%></button>
         <button type="submit" title="<%=_Encoded("Apply")%>" name="submit.Apply" value="<%=_Encoded("Apply")%>"><%=_Encoded("Apply this theme") %></button>
         <button type="submit" class="cancel" title="<%=_Encoded("Cancel")%>" name="submit.Cancel" value="<%=_Encoded("Cancel")%>"><%=_Encoded("Cancel")%></button>
-        <%=Html.Hidden("ReturnUrl", Context.Request.Url)%>
     </fieldset>
 <% } %>
 </div>
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index 4db79018b..af33ef011 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -731,8 +731,11 @@ todo: (heskew) pull out into relevant modules where appropriate
     zoom:1;
     *display: inline;
 }
-.templates fieldset {
-    margin:0 0 .933%;
+.templates .inline button {
+    font-size:1.2em;
+}
+.templates .wasFormInlineLink {
+    font-size:1.4em;
 }
 .templates p {
     overflow:hidden;