diff --git a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
index eb9698417..3ad0e2484 100644
--- a/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Core/Navigation/Views/Admin/Index.cshtml
@@ -35,7 +35,7 @@
     }
     </tbody>
 </table>
-<fieldset class="actions"><button type="submit" class="button primaryAction">@T("Update All")</button></fieldset>
+<fieldset class="actions"><button type="submit" class="primaryAction">@T("Update All")</button></fieldset>
 }
 
 <h2>@T("Add New Item")</h2>
diff --git a/src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml b/src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml
index a83d7786c..b1504ef3c 100644
--- a/src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml
@@ -3,7 +3,6 @@
     @Html.ValidationSummary()
     @Display(Model.Content)
     <fieldset>
-        <input class="button primaryAction" type="submit" value="@T("Save")" />
+        <button class="primaryAction" type="submit">@T("Save")</button>
     </fieldset>
-}
-
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
index de39cc240..ab2642930 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Orchard.Blogs.csproj
@@ -158,7 +158,6 @@
     <Content Include="Views\EditorTemplates\Parts\Blogs.BlogArchives.cshtml" />
     <Content Include="Views\Items\Content-Blog.DetailAdmin.cshtml" />
     <Content Include="Views\Items\Content-Blog.Edit.cshtml" />
-    <Content Include="Views\Items\Content-BlogPost.Editor.cshtml" />
     <Content Include="Views\Parts\Blogs.BlogPost.List.cshtml" />
     <Content Include="Views\Parts\Blogs.RecentBlogPosts.cshtml" />
     <Content Include="Views\Parts\Blogs.Blog.BlogPostCount.cshtml" />
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Edit.cshtml
index 92f5bf5b8..e9efacebb 100644
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-Blog.Edit.cshtml
@@ -8,7 +8,5 @@
     </div>
     <div class="secondary">
         @Display(Model.Sidebar)
-        @* todo: (heskew) remove when the CommonPart is adding the save button *@
-        <fieldset><button class="primaryAction" type="submit">@T("Save")</button></fieldset>
     </div>
 </div>
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.Editor.cshtml b/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.Editor.cshtml
deleted file mode 100644
index a73373f4f..000000000
--- a/src/Orchard.Web/Modules/Orchard.Blogs/Views/Items/Content-BlogPost.Editor.cshtml
+++ /dev/null
@@ -1,23 +0,0 @@
-@* todo: (heskew) remove - not being used but keeping around for the "remove draft" reminder *@
-
-@using Orchard.Blogs.Models;
-@{
-    Html.AddTitleParts((string)Model.Title);
-    BlogPostPart blogPost = Model.ContentItem.Get(typeof(BlogPostPart));
-}
-<div class="sections">
-    <div class="primary">
-        @Display(Model.Content)
-    </div>
-    <div class="secondary">
-        @Display(Model.Sidebar)
-        @* todo: (heskew) remove when the CommonPart is adding the save button - also move the remove draft functionality to the CommonPart at that time *@
-        <fieldset>
-            <button class="primaryAction" type="submit" name="submit.Save">@T("Save")</button>
-            @* TODO: (erikpo) In the future, remove the HasPublished check so the user can delete the content item from here if the choose to *@
-            @if (blogPost.HasDraft && blogPost.HasPublished) {
-            @Html.AntiForgeryTokenValueOrchardLink(T("Discard Draft").ToString(), Url.Action("DiscardDraft", new {Area = "Orchard.Blogs", Controller = "BlogPostAdmin", id = Model.Item.Id}), new {@class = "button"})
-            }
-        </fieldset>
-    </div>
-</div>asdfsdaf
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.cshtml
index 6f03b8792..60f2840d9 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Details.cshtml
@@ -13,7 +13,7 @@
     } else {
         using (Html.BeginFormAntiForgeryPost(Url.Action("Close", new { commentedItemId = Model.CommentedItemId }), FormMethod.Post, new { @class = "inline" })) { 
     <fieldset>
-        <button type="submit" class="button primaryAction" title="@T("Close Comments")">@T("Close Comments")</button>
+        <button type="submit" class="primaryAction" title="@T("Close Comments")">@T("Close Comments")</button>
     </fieldset>
         }
     } 
@@ -29,7 +29,7 @@
             @Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.MarkAsSpam, T("Mark as Spam").ToString())
             @Html.SelectOption(Model.Options.BulkAction, CommentDetailsBulkAction.Delete, T("Remove").ToString())
         </select>
-        <input class="button" type="submit" name="submit.BulkEdit" value="@T("Apply")" />
+        <button type="submit" name="submit.BulkEdit" value="@T("Apply")">@T("Apply")</button>
     </fieldset>
     <fieldset class="bulk-actions">
         <label for="filterResults">@T("Filter:")</label>
@@ -39,7 +39,7 @@
             @Html.SelectOption(Model.Options.Filter, CommentDetailsFilter.Pending, T("Pending Comments").ToString())
             @Html.SelectOption(Model.Options.Filter, CommentDetailsFilter.Spam, T("Spam").ToString())
         </select>
-        <input class="button" type="submit" name="submit.Filter" value="@T("Apply")"/>
+        <button type="submit" name="submit.Filter" value="@T("Apply")">@T("Apply")</button>
     </fieldset>
     <fieldset>
 		<table class="items" summary="@T("This is a table of the comments for the content item")">
@@ -108,7 +108,7 @@
     } else {
         using (Html.BeginFormAntiForgeryPost(Url.Action("Close", new { commentedItemId = Model.CommentedItemId }), FormMethod.Post, new { @class = "inline" })) { 
     <fieldset>
-        <button type="submit" class="button primaryAction" title="@T("Close Comments")">@T("Close Comments")</button>
+        <button type="submit" class="primaryAction" title="@T("Close Comments")">@T("Close Comments")</button>
     </fieldset>
         }
     } 
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.cshtml
index 62a826b00..d7cbc72b6 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Edit.cshtml
@@ -40,6 +40,6 @@
         </div>
     </fieldset>
     <fieldset>
-	    <input type="submit" class="button" value="@T("Save")" />
+        <button class="primaryAction" type="submit">@T("Save")</button>
     </fieldset>
 } 
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml
index 2878c480f..fc9f235fb 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Admin/Index.cshtml
@@ -19,7 +19,7 @@
             @Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.MarkAsSpam, T("Mark as Spam").ToString())
             @Html.SelectOption(Model.Options.BulkAction, CommentIndexBulkAction.Delete, T("Remove").ToString())
         </select>
-        <input class="button" type="submit" name="submit.BulkEdit" value="@T("Apply")" />
+        <button type="submit" name="submit.BulkEdit" value="@T("Apply")">@T("Apply")</button>
     </fieldset>
     <fieldset class="bulk-actions">
         <label for="filterResults">@T("Filter:")</label>
@@ -29,7 +29,7 @@
             @Html.SelectOption(Model.Options.Filter, CommentIndexFilter.Pending, T("Pending Comments").ToString())
             @Html.SelectOption(Model.Options.Filter, CommentIndexFilter.Spam, T("Spam").ToString())
         </select>
-        <input class="button" type="submit" name="submit.Filter" value="@T("Apply")"/>
+        <button type="submit" name="submit.Filter" value="@T("Apply")">@T("Apply")</button>
     </fieldset>
     <fieldset>
 	    <table class="items" summary="@T("This is a table of the comments in your application")">
@@ -78,7 +78,20 @@
                 </td>
                 <td>@Html.ItemDisplayLink(commentEntry.CommentedOn)</td>
                 <td>
-                    <div class="actions">
                        @if (commentEntry.Comment.Status != CommentStatus.Spam) {
                            <a href="@Url.Action("MarkAsSpam", new {commentEntry.Comment.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="RemoveUrl UnsafeUrl">@T("Spam")</a>@T(" | ")
                        }
                        @if (commentEntry.Comment.Status != CommentStatus.Approved) {
                            <a href="@Url.Action("Approve", new {commentEntry.Comment.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="ApproveUrl UnsafeUrl">@T("Approve")</a>@T(" | ")
                        }
                        else {
                            <a href="@Url.Action("Unapprove", new {commentEntry.Comment.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="UnapproveUrl UnsafeUrl">@("Unapprove")</a>@T(" | ")
                        }
                        <a href="@Url.Action("Edit", new {commentEntry.Comment.Id})" title="@T("Edit")">@T("Edit")</a>@T(" | ")
                        <a href="@Url.Action("Delete", new {commentEntry.Comment.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="RemoveUrl UnsafeUrl">@T("Remove")</a>
                    </div>
                </td>
+                    <div class="actions">
+                        @if (commentEntry.Comment.Status != CommentStatus.Spam) {
+                            <a href="@Url.Action("MarkAsSpam", new {commentEntry.Comment.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="RemoveUrl UnsafeUrl">@T("Spam")</a>@T(" | ")
+                        }
+                        @if (commentEntry.Comment.Status != CommentStatus.Approved) {
+                            <a href="@Url.Action("Approve", new {commentEntry.Comment.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="ApproveUrl UnsafeUrl">@T("Approve")</a>@T(" | ")
+                        }
+                        else {
+                            <a href="@Url.Action("Unapprove", new {commentEntry.Comment.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="UnapproveUrl UnsafeUrl">@("Unapprove")</a>@T(" | ")
+                        }
+                        <a href="@Url.Action("Edit", new {commentEntry.Comment.Id})" title="@T("Edit")">@T("Edit")</a>@T(" | ")
+                        <a href="@Url.Action("Delete", new {commentEntry.Comment.Id, returnUrl = ViewContext.RequestContext.HttpContext.Request.ToUrlString()})" itemprop="RemoveUrl UnsafeUrl">@T("Remove")</a>
+                    </div>
+                </td>
             </tr>
             commentIndex = commentIndex + 1;
             } 
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.cshtml
index 858390461..6d825239a 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/Parts/Comments.cshtml
@@ -55,7 +55,7 @@ using (Html.BeginForm("Create", "Comment", new { area = "Orchard.Comments" }, Fo
             <textarea id="comment-text" rows="10" cols="30" name="CommentText"></textarea>
         </li>
         <li>
-            <input type="submit" class="button" value="@T("Submit Comment")" />
+            <button class="primaryAction" type="submit">@T("Submit Comment")</button>
             @Html.Hidden("CommentedOn", (int)Model.ContentPart.ContentItem.Id) 
             @Html.Hidden("ReturnUrl", Context.Request.ToUrlString()) 
             @Html.AntiForgeryTokenOrchard() 
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddFieldTo.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddFieldTo.cshtml
index f71dffd64..f9a849799 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddFieldTo.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddFieldTo.cshtml
@@ -1,6 +1,7 @@
 @model Orchard.ContentTypes.ViewModels.AddFieldViewModel
 @{ Style.Require("ContentTypesAdmin"); }
-<h1>@Html.TitleForPage(T("Add New Field To \"{0}\"", Model.Part.DisplayName).ToString())</h1>@using (Html.BeginFormAntiForgeryPost()) {
+<h1>@Html.TitleForPage(T("Add New Field To \"{0}\"", Model.Part.DisplayName).ToString())</h1>
+@using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
     <fieldset>
         <label for="DisplayName">@T("Display Name")</label>
@@ -12,4 +13,5 @@
     </fieldset>
     <fieldset>
         <button class="primaryAction" type="submit">@T("Save")</button>
-    </fieldset>}
+    </fieldset>
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddPartsTo.cshtml b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddPartsTo.cshtml
index e2335d8bb..ca6f5f08e 100644
--- a/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddPartsTo.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.ContentTypes/Views/Admin/AddPartsTo.cshtml
@@ -1,6 +1,7 @@
 @model Orchard.ContentTypes.ViewModels.AddPartsViewModel
 @{ Style.Require("ContentTypesAdmin"); }
-<h1>@Html.TitleForPage(T("Add Parts To \"{0}\"", Model.Type.DisplayName).ToString())</h1>@using (Html.BeginFormAntiForgeryPost()) {
+<h1>@Html.TitleForPage(T("Add Parts To \"{0}\"", Model.Type.DisplayName).ToString())</h1>
+@using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
     <fieldset>
         @Html.UnorderedList(
@@ -19,4 +20,5 @@
     </fieldset>
     <fieldset>
         <button class="primaryAction" type="submit">@T("Save")</button>
-    </fieldset>}
+    </fieldset>
+}
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Experimental/Views/Metadata/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Metadata/Index.cshtml
index e8f453338..1bfe0ec36 100644
--- a/src/Orchard.Web/Modules/Orchard.Experimental/Views/Metadata/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Experimental/Views/Metadata/Index.cshtml
@@ -41,5 +41,5 @@
     @Html.TextAreaFor(m=>m.ExportText, new{style="width:100%;height:640px;"})
     <br />
 
-    <input class="button primaryAction" type="submit" value="@T("Merge Changes")" />
+    <button class="primaryAction" type="submit">@T("Merge Changes")</button>
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.cshtml
index cb660e72e..81ecc38c4 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Add.cshtml
@@ -22,7 +22,7 @@
         <input type="hidden" id="MediaPath" name="MediaPath" value="@Model.MediaPath" />
     </fieldset>
     <fieldset>
-		<input type="submit" class="button primaryAction" value="@T("Upload")" />
+        <button class="primaryAction" type="submit">@T("Upload")</button>
 		@Html.AntiForgeryTokenOrchard()
 	</fieldset>
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.cshtml
index 4783387d6..c5981469f 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Create.cshtml
@@ -21,6 +21,6 @@
 	    <input type="hidden" id="MediaPath" name="MediaPath" value="@Model.MediaPath" />
     </fieldset>
 	<fieldset>
-	    <input type="submit" class="button primaryAction" value="@T("Save")" />
+        <button class="primaryAction" type="submit">@T("Save")</button>
     </fieldset>
  }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.cshtml
index 8dc0d33f0..87307bc67 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Edit.cshtml
@@ -24,7 +24,7 @@
         <select id="Select1" name="publishActions">
             <option value="1">@T("Remove")</option>
         </select>
-        <input class="button" type="submit" value="@T("Apply")" />
+        <button type="submit">@T("Apply")</button>
     </fieldset>
 
     <div class="manage">
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.cshtml
index 9dee177e3..5837d24bd 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditMedia.cshtml
@@ -49,7 +49,7 @@
 			    </div>
 		    </fieldset>
 		    <fieldset>
-			    <input type="submit" class="button primaryAction" name="submit.Save" value="@T("Save")" />
+                <button class="primaryAction" type="submit" name="submit.Save" value="@T("Save")">@T("Save")</button>
             </fieldset>
 	    </div>
 	    @*
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.cshtml
index 2e7863f4c..ffb1697a1 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/EditProperties.cshtml
@@ -22,7 +22,7 @@
 		<input id="Name" class="textMedium" name="Name" type="text" value="@Model.Name" />
     </fieldset>
     <fieldset>		
-		<input type="submit" class="button primaryAction" name="submit.Save" value="@T("Save")" />
-		<input type="submit" class="button buttonFocus roundCorners" name="submit.Delete" value="@T("Delete")" />
+        <button class="primaryAction" type="submit" name="submit.Save" value="@T("Save")">@T("Save")</button>
+        <button type="submit" name="submit.Delete" value="@T("Remove")">@T("Remove")</button>
     </fieldset>
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Index.cshtml
index 1c8f96a7b..213389acd 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/Admin/Index.cshtml
@@ -8,7 +8,7 @@
         <select id="Select1" name="publishActions">
             <option value="1">@T("Remove")</option>
         </select>
-        <input class="button roundCorners" type="submit" value="@T("Apply")" />
+        <button type="submit">@T("Apply")</button>
     </fieldset>
 
     <div class="manage">@Html.ActionLink(T("Add a folder").ToString(), "Create", new { }, new { @class = "button primaryAction" })</div>
diff --git a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.cshtml b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.cshtml
index e8e8b50c8..a8e5906ce 100644
--- a/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Modules/Views/Admin/Add.cshtml
@@ -12,6 +12,6 @@
             <label for="ModulePackage">@T("Module Package")</label>
             <input type="file" id="ModulePackage" size="64" name="ModulePackage" />
         </fieldset>
-        <button type="submit" class="button primaryAction">@T("Install")</button>
+        <button type="submit" class="primaryAction">@T("Install")</button>
     }
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Add.cshtml b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Add.cshtml
index 3bc738332..30e4f1711 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Add.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Add.cshtml
@@ -41,6 +41,6 @@
         </div>
     </fieldset>
 	<fieldset>
-	    <input type="submit" class="button primaryAction" value="@T("Save")" />
+        <button class="primaryAction" type="submit">@T("Save")</button>
     </fieldset>
  }
diff --git a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml
index 0aecbcc75..d1e96d65a 100644
--- a/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.MultiTenancy/Views/Admin/Edit.cshtml
@@ -43,6 +43,6 @@
         </div>
     </fieldset>
 	<fieldset>
-	    <input type="submit" class="button primaryAction" value="@T("Save")" />
+        <button class="primaryAction" type="submit">@T("Save")</button>
     </fieldset>
 } 
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/AddSource.cshtml b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/AddSource.cshtml
index 66af2d7ec..46d6b9f16 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/AddSource.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/AddSource.cshtml
@@ -9,6 +9,6 @@
 		<input id="Url" class="textMedium" name="Url" type="text" value="@Model.Url"/>
     </fieldset>
 	<fieldset>
-	    <input type="submit" class="button primaryAction" value="@T("Add Feed")" />
+        <button class="primaryAction" type="submit">@T("Add Feed")</button>
     </fieldset>
  }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Harvest.cshtml b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Harvest.cshtml
index 816701f86..7c875da58 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Harvest.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Harvest.cshtml
@@ -26,5 +26,7 @@
         @Html.DropDownListFor(m => m.FeedUrl, new[]{new SelectListItem{Text=T("Download").ToString(),Value="Download"}}.Concat( Model.Sources.Select(x => new SelectListItem { Text = T("Push to {0}", x.FeedUrl).ToString(), Value = x.FeedUrl })))
         @Html.ValidationMessageFor(m=>m.FeedUrl)
     </fieldset>
-    <input type="submit" value="Harvest" />
+    <fieldset>
+        <button class="primaryAction" type="submit">@T("Harvest")</button>
+    </fieldset>
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.cshtml b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.cshtml
index a42a6fbda..96c97c40e 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Create.cshtml
@@ -35,6 +35,6 @@
         }
     </fieldset>
     <fieldset>
-       <input type="submit" class="button primaryAction" value="@T("Save")" />
+        <button class="primaryAction" type="submit">@T("Save")</button>
     </fieldset>
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.cshtml
index b80b1a24f..0ae63895a 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Edit.cshtml
@@ -50,7 +50,7 @@
 			}
     </fieldset>
     <fieldset>
-	    <input type="submit" class="button primaryAction" name="submit.Save" value="@T("Save")" />
-	    <input type="submit" class="button" name="submit.Delete" value="@T("Remove")" />
+        <button class="primaryAction" type="submit" name="submit.Save" value="@T("Save")">@T("Save")</button>
+        <button type="submit" name="submit.Delete" value="@T("Remove")">@T("Remove")</button>
 	</fieldset>
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml
index 44aa8971f..4be71652f 100644
--- a/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Roles/Views/Admin/Index.cshtml
@@ -9,7 +9,7 @@
         <select id="Select1" name="roleActions">
             <option value="1">@T("Remove")</option>
         </select>
-        <input class="button" type="submit" value="@T("Apply")" />
+        <button type="submit">@T("Apply")</button>
     </fieldset>
     <div class="manage">@Html.ActionLink(T("Add a role").ToString(), "Create", new { }, new { @class = "button primaryAction" })</div>
     <fieldset>
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
index 30f83c52f..eb398e92a 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Services/SetupService.cs
@@ -218,6 +218,7 @@ namespace Orchard.Setup.Services {
                 .WithPart("CommentsPart")
                 .WithPart("TagsPart")
                 .WithPart("LocalizationPart")
+                .Draftable()
                 .Indexed()
                 );
             contentDefinitionManager.AlterTypeDefinition("Page", cfg => cfg
@@ -228,6 +229,7 @@ namespace Orchard.Setup.Services {
                 .WithPart("TagsPart")
                 .WithPart("LocalizationPart")
                 .Creatable()
+                .Draftable()
                 .Indexed()
                 );
             contentDefinitionManager.AlterPartDefinition("BodyPart", cfg => cfg
diff --git a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
index 77fad9f37..3fd26831f 100644
--- a/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Setup/Views/Setup/Index.cshtml
@@ -49,6 +49,6 @@ if (!Model.DatabaseIsPreconfigured) {
 </fieldset>
 }
 <fieldset>
-    <input class="button primaryAction" type="submit" value="@T("Finish Setup")" />
+    <button class="primaryAction" type="submit">@T("Finish Setup")</button>
 </fieldset>
 }
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Create.cshtml b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Create.cshtml
index 4c02b8174..a69e65021 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Create.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Create.cshtml
@@ -10,6 +10,6 @@
     </fieldset>
 
     <fieldset>
-        <input class="button primaryAction" type="submit" value="@T("Save")" />
+        <button class="primaryAction" type="submit">@T("Save")</button>
     </fieldset>
  } 
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.cshtml
index f316cb394..4e8a41c41 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Edit.cshtml
@@ -10,6 +10,6 @@
     </fieldset>
 
     <fieldset>
-        <input class="button primaryAction" type="submit" value="@T("Save") " />
+        <button class="primaryAction" type="submit">@T("Save")</button>
     </fieldset>
  } 
diff --git a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml
index d3d0b3b4c..f16c3fb52 100644
--- a/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Tags/Views/Admin/Index.cshtml
@@ -12,7 +12,7 @@
             @Html.SelectOption(Model.BulkAction, TagAdminIndexBulkAction.None, T("Choose action...").ToString())
             @Html.SelectOption(Model.BulkAction, TagAdminIndexBulkAction.Delete, T("Remove").ToString())
         </select>
-        <input class="button" type="submit" name="submit.BulkEdit" value="@T("Apply")" />
+        <button type="submit"name="submit.BulkEdit" value="@T("Apply")">@T("Apply")</button>
     </fieldset>
 
     <div class="manage">@Html.ActionLink(T("Add a tag").ToString(), "Create", new { }, new { @class = "button primaryAction" })</div>
diff --git a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Install.cshtml b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Install.cshtml
index c67534362..038ea80e9 100644
--- a/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Install.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Themes/Views/Admin/Install.cshtml
@@ -4,7 +4,7 @@
     <fieldset>
         <label for="ThemeZipPath">@T("File Path to the zip file:")</label>
         <input id="ThemeZipPath" name="ThemeZipPath" type="file" class="text" value="@T("Browse")" size="64" /><br />
-		<input type="submit" class="button" value="@T("Install")" />
+        <button class="primaryAction" type="submit">@T("Install")</button>
 		@Html.AntiForgeryTokenOrchard()
 	</fieldset>
 } 
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChangePassword.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChangePassword.cshtml
index e3fd419e3..c52cfdde4 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChangePassword.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/ChangePassword.cshtml
@@ -22,7 +22,7 @@
             @Html.ValidationMessage("confirmPassword") 
         </div>
         <div>
-            <input type="submit" value="@T("Change Password") " />
+            <button class="primaryAction" type="submit">@T("Change Password")</button>
         </div>
     </fieldset>
  } 
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.cshtml
index f3a65a961..d28987727 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/LogOn.cshtml
@@ -1,9 +1,9 @@
 @model Orchard.Users.ViewModels.LogOnViewModel
-@using Orchard.ContentManagement;
-
-@{
-    var userCanRegister = @WorkContext.CurrentSite.As<Orchard.Users.Models.RegistrationSettingsPart>().UsersCanRegister;
-}
+@using Orchard.ContentManagement;
+
+@{
+    var userCanRegister = @WorkContext.CurrentSite.As<Orchard.Users.Models.RegistrationSettingsPart>().UsersCanRegister;
+}
 
 <h1 class="page-title">@Html.TitleForPage(Model.Title)</h1>
 <p>@T("Please enter your username and password.") @if(userCanRegister) { <text> </text> @Html.ActionLink("Register", "Register") @T(" if you don't have an account.") }</p>
@@ -26,7 +26,7 @@
     <li>
         @Html.CheckBox("rememberMe", new { id = "remember-me" })<label class="forcheckbox" for="remember-me">@T("Remember me?")</label>
     </li>
-    <input type="submit" value="@T("Sign In")" />
+    <button class="primaryAction" type="submit">@T("Sign In")</button>
     </ol>
 </fieldset>
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/Register.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/Register.cshtml
index 796760f0b..8529f5897 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Account/Register.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Account/Register.cshtml
@@ -26,7 +26,7 @@
             @Html.ValidationMessage("confirmPassword") 
         </div>
         <div>
-            <input type="submit" value="@T("Register") " />
+            <button class="primaryAction" type="submit">@T("Register")</button>
         </div>
     </fieldset>
  } 
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.cshtml
index 8f4011930..d2ca99b97 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Create.cshtml
@@ -29,8 +29,4 @@
     </fieldset>
 
     @Display(Model.User)
-
-    <fieldset>
-        <input class="button primaryAction" type="submit" value="@T("Add")" />
-    </fieldset>
  } 
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml
index d3c8ccb8d..00d0acf27 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/Admin/Edit.cshtml
@@ -17,8 +17,4 @@
     </fieldset>
 
     @Display(Model.User)
-
-    <fieldset>
-        <button class="primaryAction" type="submit">@T("Save")</button>
-    </fieldset>
  } 
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditLayer.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditLayer.cshtml
index 87aa30d15..d5292641b 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditLayer.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditLayer.cshtml
@@ -4,6 +4,6 @@
     @Display(Model)
 
     <fieldset>
-        <input type="submit" name="submit.Delete" class="button" value="@T("Delete")" />
+        <button type="submit" name="submit.Delete" value="@T("Delete")">@T("Delete")</button>
     </fieldset>
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditWidget.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditWidget.cshtml
index 8d7f36a5c..a3b6aacf1 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditWidget.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Admin/EditWidget.cshtml
@@ -4,6 +4,7 @@
     @Display(Model)
 
     <fieldset>
-        <input type="submit" name="submit.Delete" class="button" value="@T("Delete")" />
+        <input type="submit" />
+        <button type="submit" name="submit.Delete" value="@T("Delete")">@T("Delete")</button>
     </fieldset>
 }
\ No newline at end of file
diff --git a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Widget.Edit.cshtml b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Widget.Edit.cshtml
index 696503b21..ee08a573d 100644
--- a/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Widget.Edit.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Widgets/Views/Items/Widget.Edit.cshtml
@@ -4,9 +4,5 @@
     </div>
     <div class="secondary">
         @Display(Model.Sidebar)
-        @* todo: (heskew) remove when the CommonPart is adding the save button *@
-        <fieldset>
-            <input class="button primaryAction" type="submit" name="submit.Save" value="@T("Save")"/>
-        </fieldset>
     </div>
 </div>
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index 865e0ee9f..4803ceda7 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -152,11 +152,11 @@ h3 span { font-size:.667em; } /* 12px */
 h4 { font-size:1.6em; } /* 16px */
 h5 { font-size:1.4em; } /* 14px */
 
-h6, p, dl, label, /*input, select,*/ .button,
+h6, p, dl, label, /*input, select,*/ .button, button,
 .message, .validation-summary-errors,
 table.items th, table.items td, table.items caption { font-size:1.4em; line-height:1.4em; } /* 14px */
-table.items p, table.items label, table.items input, table.items .button { font-size:1em; line-height:1em; }
-p .button { font-size:inherit; }
+table.items p, table.items label, table.items input { font-size:1em; line-height:1em; }
+p .button, table.items .button, table.items button { font-size:inherit; }
 .meta, .hint { font-size:1.2em; } /* 12px */
 form.link button { font-size:1.01em; }
 
@@ -836,11 +836,11 @@ table .button {
     margin:.5em 0;
     padding:1em;
 }
-.orchard-media fieldset div, .settings fieldset div, .orchard-media .button, .settings .button {
-    margin:1em 0 .5em 1em;
+.orchard-media fieldset div, .settings fieldset div, .settings .button {
+    margin:1em 0 .5em;
 }
 .settings legend {
-    margin:0 0 -.4em 0;
+    margin:0 0 -.4em;
 }
 /* Core Contents and Orchard.PublishLater */
 fieldset.save-button {
diff --git a/src/Orchard.Web/Themes/Themes.csproj b/src/Orchard.Web/Themes/Themes.csproj
index e5e154151..9596f0488 100644
--- a/src/Orchard.Web/Themes/Themes.csproj
+++ b/src/Orchard.Web/Themes/Themes.csproj
@@ -99,9 +99,6 @@
     <Content Include="TheAdmin\Views\Header.cshtml" />
     <Content Include="TheThemeMachine\Views\Layout.cshtml" />
   </ItemGroup>
-  <ItemGroup>
-    <Content Include="TheThemeMachine\Views\Pager.cshtml" />
-  </ItemGroup>
   <ItemGroup>
     <Content Include="TheThemeMachine\Styles\Web.config">
       <SubType>Designer</SubType>