diff --git a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
index e2d5b2adc8..70c86231b9 100644
--- a/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
+++ b/src/Umbraco.Web.UI/Umbraco.Web.UI.csproj
@@ -683,6 +683,7 @@
     </None>
     <None Include="Config\Dashboard.Release.config">
       <DependentUpon>Dashboard.config</DependentUpon>
+      <SubType>Designer</SubType>
     </None>
     <None Include="packages.config">
       <SubType>Designer</SubType>
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 4117a9e89c..8be829c8d2 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -2054,10 +2054,14 @@
     <Content Include="umbraco.presentation\umbraco\Search\QuickSearchHandler.ashx" />
     <None Include="umbraco.presentation\umbraco\templateControls\InlineXslt.xsltTemplate" />
     <Content Include="umbraco.presentation\umbraco\users\NodePermissions.ascx" />
-    <Content Include="umbraco.presentation\umbraco\users\PermissionEditor.aspx" />
+    <Content Include="umbraco.presentation\umbraco\users\PermissionEditor.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
     <Content Include="umbraco.presentation\umbraco\users\PermissionsHandler.asmx" />
     <Content Include="umbraco.presentation\umbraco\webservices\CheckForUpgrade.asmx" />
-    <Content Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx" />
+    <Content Include="umbraco.presentation\umbraco\settings\DictionaryItemList.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
     <Content Include="umbraco.presentation\umbraco\settings\scripts\editScript.aspx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>
@@ -2105,12 +2109,16 @@
     <Content Include="umbraco.presentation\umbraco\schemas\umbraco.xsd">
       <SubType>Designer</SubType>
     </Content>
-    <Content Include="umbraco.presentation\umbraco\settings\EditDictionaryItem.aspx" />
+    <Content Include="umbraco.presentation\umbraco\settings\EditDictionaryItem.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
     <Content Include="umbraco.presentation\umbraco\settings\editLanguage.aspx" />
     <Content Include="umbraco.presentation\umbraco\settings\EditMediaType.aspx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>
-    <Content Include="umbraco.presentation\umbraco\users\EditUser.aspx" />
+    <Content Include="umbraco.presentation\umbraco\users\EditUser.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
     <Content Include="umbraco.presentation\umbraco\users\EditUserType.aspx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
index 1ac3c93f9e..7af9298a15 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUser.aspx.cs
@@ -179,9 +179,12 @@ namespace umbraco.cms.presentation.user
 
             userInfo.HasMenu = true;
 
-            ImageButton save = userInfo.Menu.NewImageButton();
-            save.ImageUrl = SystemDirectories.Umbraco + "/images/editor/save.gif";
-            save.Click += new ImageClickEventHandler(saveUser_Click);
+            var save = userInfo.Menu.NewButton();
+            save.Click += saveUser_Click;
+            save.ID = "save";
+            save.ToolTip = ui.Text("save");
+            save.Text = ui.Text("save");
+            save.ButtonType = MenuButtonType.Primary;
 
             sectionValidator.ServerValidate += new ServerValidateEventHandler(sectionValidator_ServerValidate);
             sectionValidator.ControlToValidate = lapps.ID;
@@ -288,11 +291,7 @@ namespace umbraco.cms.presentation.user
             channelInfo.Controls.Add(ppInfo);
             channelInfo.Controls.Add(ppFields);
 
-            channelInfo.HasMenu = true;
-            ImageButton save = channelInfo.Menu.NewImageButton();
-            save.ImageUrl = SystemDirectories.Umbraco + "/images/editor/save.gif";
-            save.Click += new ImageClickEventHandler(saveUser_Click);
-            save.ID = "save";
+
             if (!IsPostBack)
             {
                 cName.Text = userChannel.Name;
@@ -371,7 +370,7 @@ namespace umbraco.cms.presentation.user
         /// </summary>
         /// <param name="sender">The source of the event.</param>
         /// <param name="e">The <see cref="System.Web.UI.ImageClickEventArgs"/> instance containing the event data.</param>
-        private void saveUser_Click(object sender, ImageClickEventArgs e)
+        private void saveUser_Click(object sender, EventArgs e)
         {
             if (base.IsValid)
             {
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs
index 3211033f7d..b41df24988 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/EditUserType.aspx.cs
@@ -29,10 +29,12 @@ namespace umbraco.cms.presentation.user
         {
             pnlUmbraco.Text = umbraco.ui.Text("usertype", base.getUser());
 
-            ImageButton save = pnlUmbraco.Menu.NewImageButton();
-            save.ImageUrl = SystemDirectories.Umbraco + "/images/editor/save.gif";
-            save.Click += new ImageClickEventHandler(save_Click);
+            var save = pnlUmbraco.Menu.NewButton();
+            save.Click += save_Click;
             save.ID = "save";
+            save.ToolTip = ui.Text("save");
+            save.Text = ui.Text("save");
+
             pp_alias.Text = umbraco.ui.Text("usertype", base.getUser()) + " " + umbraco.ui.Text("alias", base.getUser());
             pp_name.Text = umbraco.ui.Text("usertype", base.getUser()) + " " + umbraco.ui.Text("name", base.getUser());
 
@@ -56,7 +58,7 @@ namespace umbraco.cms.presentation.user
 
         }
 
-        void save_Click(object sender, ImageClickEventArgs e)
+        void save_Click(object sender, EventArgs e)
         {
             UserType userType = CurrentUserType;
             userType.Name = txtUserTypeName.Text;
diff --git a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs
index 935858ca2b..6887cd0803 100644
--- a/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs
+++ b/src/Umbraco.Web/umbraco.presentation/umbraco/users/PermissionEditor.aspx.cs
@@ -50,10 +50,12 @@ namespace umbraco.cms.presentation.user
 
             CheckUser(Request.QueryString["id"]);
 
-            ImageButton save = pnlUmbraco.Menu.NewImageButton();
+            var save = pnlUmbraco.Menu.NewButton();
             save.ID = "btnSave";
-            save.ImageUrl = SystemDirectories.Umbraco + "/images/editor/save.gif";
-			save.OnClientClick = "SavePermissions(); return false;";
+            save.OnClientClick = "SavePermissions(); return false;";
+            save.Text = ui.Text("save");
+            save.ToolTip = ui.Text("save");
+
 
             nodePermissions.UserID = Convert.ToInt32(Request.QueryString["id"]);
             pnlUmbraco.Text = ui.Text("user", "userPermissions");