diff --git a/src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx b/src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx
index db2b592305..62d7d9492b 100644
--- a/src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx
+++ b/src/Umbraco.Web.UI/umbraco/dialogs/rollBack.aspx
@@ -1,68 +1,98 @@
 <%@ Page Language="c#" Codebehind="rollBack.aspx.cs" MasterPageFile="../masterpages/umbracoDialog.Master"AutoEventWireup="True" Inherits="umbraco.presentation.dialogs.rollBack" %>
+
 <%@ Register TagPrefix="cc1" Namespace="umbraco.uicontrols" Assembly="controls" %>
 <%@ Register TagPrefix="umb" Namespace="ClientDependency.Core.Controls" Assembly="ClientDependency.Core" %>
 
 <asp:Content ContentPlaceHolderID="head" runat="server">
-  <script type="text/javascript">
-  function doSubmit() {document.Form1["ok"].click()}
+    <script type="text/javascript">
+        function doSubmit() { document.Form1["ok"].click() }
 
-	  var functionsFrame = this;
-	  var tabFrame = this;
-	  var isDialog = true;
-	  var submitOnEnter = true;
-  </script>
+        var functionsFrame = this;
+        var tabFrame = this;
+        var isDialog = true;
+        var submitOnEnter = true;
+    </script>
 
+    <style type="text/css">
+        .propertyItemheader {
+            width: 140px !Important;
+        }
 
-  
-  
-  <style type="text/css">
-	.propertyItemheader{width: 140px !Important;}
-	.diff{margin-top: 10px; height: 100%; overflow: auto; border: 1px solid #ccc; font-family: verdana; font-size: 11px; padding: 5px;}
-	.diff table td{border-bottom: 1px solid #ccc; padding: 3px;}
-	.diff del{background: rgb(255, 230, 230) none repeat scroll 0%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial;}
-	.diff ins{background: rgb(230, 255, 230) none repeat scroll 0%; -moz-background-clip: -moz-initial; -moz-background-origin: -moz-initial; -moz-background-inline-policy: -moz-initial;}
-	.diff .diffnotice{text-align: center; margin-bottom: 10px;}
-		</style>
-		</asp:Content>
+        .diff {
+            margin-top: 10px;
+            height: 100%;
+            overflow: auto;
+            border-top: 1px solid #efefef;
+            padding: 5px;
+        }
+
+            .diff table td {
+                border-bottom: 1px solid #ccc;
+                padding: 3px;
+            }
+
+            .diff del {
+                background: rgb(255, 230, 230) none repeat scroll 0%;
+                -moz-background-clip: -moz-initial;
+                -moz-background-origin: -moz-initial;
+                -moz-background-inline-policy: -moz-initial;
+            }
+
+            .diff ins {
+                background: rgb(230, 255, 230) none repeat scroll 0%;
+                -moz-background-clip: -moz-initial;
+                -moz-background-origin: -moz-initial;
+                -moz-background-inline-policy: -moz-initial;
+            }
+
+            .diff .diffnotice {
+                text-align: center;
+                margin-bottom: 10px;
+            }
+    </style>
+</asp:Content>
 
 <asp:Content ContentPlaceHolderID="body" runat="server">
-	<umb:JsInclude ID="JsInclude1" runat="server" FilePath="js/umbracoCheckKeys.js" PathNameAlias="UmbracoRoot"/>
+    <div class="umb-dialog-body">
+        <umb:JsInclude ID="JsInclude1" runat="server" FilePath="js/umbracoCheckKeys.js" PathNameAlias="UmbracoRoot" />
 
-<cc1:Feedback ID="feedBackMsg" runat="server" />
+        <cc1:Feedback ID="feedBackMsg" runat="server" />
 
-	<cc1:Pane ID="pp_selectVersion" runat="server" Text="Select a version to compare with the current version">
-	  <cc1:PropertyPanel id="pp_currentVersion" Text="Current version" runat="server"><asp:Literal ID="currentVersionTitle" runat="server"/> <small>(<asp:Literal ID="currentVersionMeta" runat="server"/>)</small></cc1:PropertyPanel> 
-	  <cc1:PropertyPanel ID="pp_rollBackTo" Text="Rollback to" runat="server"><asp:DropDownList OnSelectedIndexChanged="version_load" ID="allVersions" runat="server" Width="400px" AutoPostBack="True" CssClass="guiInputTextTiny" /></cc1:PropertyPanel>
-	  <cc1:PropertyPanel id="pp_view" Text="View" runat="server">
-	      <small>
-	          <asp:RadioButtonList ID="rbl_mode" runat="server" OnSelectedIndexChanged="version_load" RepeatDirection="Horizontal" >
-	            <asp:ListItem Selected="True" Value="diff">Diff</asp:ListItem>
-	            <asp:ListItem Value="html">Html</asp:ListItem>
-	          </asp:RadioButtonList>
-	      </small>
-	  </cc1:PropertyPanel>
-	</cc1:Pane>
+        <cc1:Pane ID="pp_selectVersion" runat="server" Text="Select a version to compare with the current version">
+            <cc1:PropertyPanel id="pp_currentVersion" Text="Current version" runat="server">
+                <asp:Literal ID="currentVersionTitle" runat="server" />
+                <small>(<asp:Literal ID="currentVersionMeta" runat="server" />)</small></cc1:PropertyPanel>
+            <cc1:PropertyPanel ID="pp_rollBackTo" Text="Rollback to" runat="server">
+                <asp:DropDownList OnSelectedIndexChanged="version_load" ID="allVersions" runat="server" Width="400px" AutoPostBack="True" CssClass="guiInputTextTiny" />
+            </cc1:PropertyPanel>
 
-  <asp:Panel ID="diffPanel" Visible="false" runat="server" Height="300px">
-  <div class="diff">
-      <div class="diffnotice">
-      <p>
-      <asp:Literal ID="lt_notice" runat="server" />
-      </p>
-      </div>
-            
-      <table border="0" style="width:95%;">
-	       <asp:Literal ID="propertiesCompare" runat="server"></asp:Literal>
-      </table>
-  </div>
-      
-      <p style="width:95%;">
-        <asp:Button ID="doRollback" runat="server" Enabled="False" OnClick="doRollback_Click"></asp:Button>
-        &nbsp; <em><%=umbraco.ui.Text("general", "or", this.getUser())%></em> &nbsp;
-        <a href="#" style="color: blue"  onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel", this.getUser())%></a>
-      </p>      
-      </asp:Panel>
-   
-   
+            <cc1:PropertyPanel id="pp_view" Text="View" runat="server">
+                <small>
+                    <asp:RadioButtonList ID="rbl_mode" runat="server" OnSelectedIndexChanged="version_load" RepeatDirection="Horizontal">
+                        <asp:ListItem Selected="True" Value="diff">Diff</asp:ListItem>
+                        <asp:ListItem Value="html">Html</asp:ListItem>
+                    </asp:RadioButtonList>
+                </small>
+            </cc1:PropertyPanel>
+        </cc1:Pane>
+
+        <asp:Panel ID="diffPanel" Visible="false" runat="server" Height="300px">
+            <div class="diff">
+                <div class="diffnotice">
+                    <p>
+                        <asp:Literal ID="lt_notice" runat="server" />
+                    </p>
+                </div>
+
+                <table border="0" style="width: 95%;">
+                    <asp:Literal ID="propertiesCompare" runat="server"></asp:Literal>
+                </table>
+            </div>
+        </asp:Panel>
+    </div>
+
+    <div runat="server" id="pl_buttons" visible="false" class="umb-dialog-footer btn-toolbar umb-btn-toolbar">
+        <a href="#" class="btn btn-link" onclick="UmbClientMgr.closeModalWindow()"><%=umbraco.ui.Text("general", "cancel")%></a>
+        <asp:Button ID="Button1" runat="server" CssClass="btn btn-primary" OnClick="doRollback_Click"></asp:Button>
+    </div>  
 </asp:Content>
-	
\ No newline at end of file
diff --git a/src/Umbraco.Web/Umbraco.Web.csproj b/src/Umbraco.Web/Umbraco.Web.csproj
index 161e183bc4..c11fa14d2c 100644
--- a/src/Umbraco.Web/Umbraco.Web.csproj
+++ b/src/Umbraco.Web/Umbraco.Web.csproj
@@ -1840,7 +1840,9 @@
     <Content Include="umbraco.presentation\umbraco\dialogs\create.aspx">
       <SubType>ASPXCodeBehind</SubType>
     </Content>
-    <Content Include="umbraco.presentation\umbraco\dialogs\cruds.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\cruds.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
     <Content Include="umbraco.presentation\umbraco\dialogs\emptyTrashcan.aspx" />
     <Content Include="umbraco.presentation\umbraco\dialogs\exportDocumenttype.aspx" />
     <Content Include="umbraco.presentation\umbraco\dialogs\imageViewer.aspx" />
@@ -1857,7 +1859,9 @@
       <SubType>ASPXCodeBehind</SubType>
     </Content>
     <Content Include="umbraco.presentation\umbraco\dialogs\RegexWs.aspx" />
-    <Content Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx" />
+    <Content Include="umbraco.presentation\umbraco\dialogs\rollBack.aspx">
+      <SubType>ASPXCodeBehind</SubType>
+    </Content>
     <Content Include="umbraco.presentation\umbraco\dialogs\sendToTranslation.aspx" />
     <Content Include="umbraco.presentation\umbraco\dialogs\uploadImage.aspx" />
     <Content Include="umbraco.presentation\umbraco\dialogs\viewAuditTrail.aspx" />
diff --git a/src/umbraco.controls/ProgressBar.cs b/src/umbraco.controls/ProgressBar.cs
index 5304e92fb5..89cff8fe24 100644
--- a/src/umbraco.controls/ProgressBar.cs
+++ b/src/umbraco.controls/ProgressBar.cs
@@ -7,7 +7,7 @@ using System.Web.UI.WebControls;
 namespace umbraco.uicontrols
 {
     [Obsolete("Use Umbraco.Web.UI.Controls.ProgressBar")]
-    public class ProgressBar : System.Web.UI.WebControls.Image
+    public class ProgressBar : System.Web.UI.WebControls.Panel
     {
         private string _title = umbraco.ui.Text("publish", "inProgress", null);
         public string Title { get; set; }
@@ -17,9 +17,8 @@ namespace umbraco.uicontrols
             if(!string.IsNullOrEmpty(Title))
                 _title = Title;
 
-            base.ImageUrl = IO.SystemDirectories.Umbraco_client + "/images/progressBar.gif";
-            base.AlternateText = _title;
-
+            base.CssClass = "umb-loader";
+            
             base.Render(writer);
         }
     }