diff --git a/src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml b/src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml
index c5c22fb18..f20c11a9f 100644
--- a/src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Core/Settings/Views/Admin/Index.cshtml
@@ -1,7 +1,6 @@
 @using Orchard.ContentManagement
 @{
-    GroupInfo groupInfo = Model.GroupInfo;
-    Layout.Title = (groupInfo != null ? T("Settings for {0}", groupInfo.Name) : T("General Settings")).ToString();
+    Layout.Title = T("Settings").ToString();
 }
 
 @using (Html.BeginFormAntiForgeryPost()) {
diff --git a/src/Orchard.Web/Core/Settings/Views/EditorTemplates/Parts.Settings.SiteSettingsPart.cshtml b/src/Orchard.Web/Core/Settings/Views/EditorTemplates/Parts.Settings.SiteSettingsPart.cshtml
index fc6d61a59..1a17f19bc 100644
--- a/src/Orchard.Web/Core/Settings/Views/EditorTemplates/Parts.Settings.SiteSettingsPart.cshtml
+++ b/src/Orchard.Web/Core/Settings/Views/EditorTemplates/Parts.Settings.SiteSettingsPart.cshtml
@@ -8,7 +8,7 @@
     }, "Id", "Text", (int)Model.ResourceDebugMode);
 }
 <fieldset>
-    <legend>@T("Enter Settings")</legend>
+    <legend>@T("General Settings")</legend>
     <div>
         <label for="SiteName">@T("Site name")</label>
         @Html.EditorFor(m => m.SiteName)
diff --git a/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comments.SiteSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comments.SiteSettings.cshtml
index d10fd3998..29a2728c3 100644
--- a/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comments.SiteSettings.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Comments/Views/EditorTemplates/Parts.Comments.SiteSettings.cshtml
@@ -2,7 +2,7 @@
 @using Orchard.Comments.Models;
 
 <fieldset>
-    <legend>@T("Enter Settings")</legend>
+    <legend>@T("Settings for Comments")</legend>
     <div>
         @Html.EditorFor(m => m.ModerateComments)
         <label class="forcheckbox" for="CommentSettings_ModerateComments">@T("Comments must be approved before they appear")</label>
diff --git a/src/Orchard.Web/Modules/Orchard.Indexing/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Indexing/Views/Admin/Index.cshtml
index d8e557c4c..d0dd2bc00 100644
--- a/src/Orchard.Web/Modules/Orchard.Indexing/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Indexing/Views/Admin/Index.cshtml
@@ -1,7 +1,7 @@
 @model Orchard.Indexing.ViewModels.IndexViewModel
 @using Orchard.Indexing.Services;
 
-@{ Layout.Title = T("Search Index Management").ToString(); }
+@{ Layout.Title = T("Settings").ToString(); }
 
 @using (Html.BeginForm("update", "admin", FormMethod.Post, new {area = "Orchard.Indexing"})) { 
     <fieldset>
diff --git a/src/Orchard.Web/Modules/Orchard.Media/Views/EditorTemplates/Parts/Media.MediaSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Media/Views/EditorTemplates/Parts/Media.MediaSettings.cshtml
index 9dbb35bd3..fdea4d4e9 100644
--- a/src/Orchard.Web/Modules/Orchard.Media/Views/EditorTemplates/Parts/Media.MediaSettings.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Media/Views/EditorTemplates/Parts/Media.MediaSettings.cshtml
@@ -1,7 +1,7 @@
 @model Orchard.Media.Models.MediaSettingsPartRecord
 
 <fieldset>
-    <legend>@T("Enter Settings")</legend>
+    <legend>@T("Settings for Media")</legend>
     <div>
         @Html.LabelFor(m => m.UploadAllowedFileTypeWhitelist, T("Upload allowed file types (list of extensions separated by spaces)")) 
         @Html.TextBoxFor(m => m.UploadAllowedFileTypeWhitelist, new { @class = "textMedium" }) 
diff --git a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Sources.cshtml b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Sources.cshtml
index 556e72c93..e0571d301 100644
--- a/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Sources.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Packaging/Views/Gallery/Sources.cshtml
@@ -1,7 +1,8 @@
 @model Orchard.Packaging.ViewModels.PackagingSourcesViewModel
 
-@{ Layout.Title = T("Settings for Gallery").ToString(); }
+@{ Layout.Title = T("Settings").ToString(); }
 
+<h2>@T("Settings for Gallery")</h2>
 <div class="manage">
     @Html.ActionLink(T("Add Feed").Text, "AddSource", new { }, new { @class = "button primaryAction" })
 </div>
diff --git a/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.cshtml
index 8cedcbd4b..4c9e85d67 100644
--- a/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Search/Views/EditorTemplates/Parts/Search.SiteSettings.cshtml
@@ -2,7 +2,7 @@
 @using Orchard.Search.ViewModels;
 
 <fieldset>
-    <legend>@T("Enter Settings")</legend>
+    <legend>@T("Settings for Search")</legend>
     <div>
         @{var entryIndex = 0;}
 
diff --git a/src/Orchard.Web/Modules/Orchard.Users/Views/EditorTemplates/Parts/Users.RegistrationSettings.cshtml b/src/Orchard.Web/Modules/Orchard.Users/Views/EditorTemplates/Parts/Users.RegistrationSettings.cshtml
index 3947b1275..d83aad4e2 100644
--- a/src/Orchard.Web/Modules/Orchard.Users/Views/EditorTemplates/Parts/Users.RegistrationSettings.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Users/Views/EditorTemplates/Parts/Users.RegistrationSettings.cshtml
@@ -1,7 +1,7 @@
 @model Orchard.Users.Models.RegistrationSettingsPartRecord
 
 <fieldset>
-    <legend>@T("Enter Settings")</legend>
+    <legend>@T("Settings for Users")</legend>
     <div>
         @Html.EditorFor(m => m.UsersCanRegister) 
         <label class="forcheckbox" for="@Html.FieldIdFor( m => m.UsersCanRegister)">@T("Users can create new accounts on the site")</label>
diff --git a/src/Orchard.Web/Modules/Orchard.Warmup/Views/Admin/Index.cshtml b/src/Orchard.Web/Modules/Orchard.Warmup/Views/Admin/Index.cshtml
index e3959fb81..31ed92bd5 100644
--- a/src/Orchard.Web/Modules/Orchard.Warmup/Views/Admin/Index.cshtml
+++ b/src/Orchard.Web/Modules/Orchard.Warmup/Views/Admin/Index.cshtml
@@ -2,13 +2,13 @@
 @using Orchard.Utility.Extensions;
 @using Orchard.Warmup.Models;
 
-@{ Layout.Title = T("Settings for Warmup").ToString(); }
+@{ Layout.Title = T("Settings").ToString(); }
 
 @using (Html.BeginFormAntiForgeryPost()) {
     @Html.ValidationSummary()
 
 <fieldset>
-    <legend>@T("Enter Settings")</legend>
+    <legend>@T("Settings for Warmup")</legend>
     <div>
         <label for="@Html.FieldIdFor(m => m.Urls)">@T("Urls for which static warmup pages will be generated")</label>
         @Html.TextAreaFor(m => m.Urls, new { @class = "textMedium" })
diff --git a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
index eb86061a0..684920f9c 100644
--- a/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
+++ b/src/Orchard.Web/Themes/TheAdmin/Styles/site.css
@@ -544,7 +544,7 @@ span.message {
 
 form              { margin: 0; padding: 0;}
 legend            { font-size: 1.231em; font-weight: normal; border:none;}
-fieldset          { padding:6px 0 0; margin:0 0 1em 0; border: 0px solid #dbdbdb; }
+fieldset          { padding:6px 0 0; margin:0 0 12px 0; border: 0px solid #dbdbdb; }
 label             { font-weight:normal; display:block; padding: 0 0 0.3em 0; }
 label.forcheckbox { margin:0 0 0 .4em; display:inline; }
 
@@ -1032,7 +1032,8 @@ html.dyn #submit-pager, html.dyn .apply-bulk-actions-auto { display:none; }
     margin:.5em 0;
 }
 .settings legend {
-    margin:0 0 -.4em;
+    margin:0 0 0 0;
+    font-size:18px;
 }
 /* Core Contents and Orchard.PublishLater */