diff --git a/README.md b/README.md
index 0b8f4ceaf..ac9c97f34 100644
--- a/README.md
+++ b/README.md
@@ -1,11 +1,13 @@
 XenCenter
 =========
 
+[![Lines of Code](https://tokei.rs/b1/github/xenserver/xenadmin)](https://github.com/xenserver/xenadmin)
+
 This repository contains the source code for XenCenter.
 
-XenCenter is a Windows-based management tool for XenServer environments
-which enables users to manage and monitor XenServer hosts and resource pools,
-and to deploy, monitor, manage and migrate virtual machines.
+XenCenter is a Windows-based management tool for Citrix Hypervisor environments,
+which enables users to manage and monitor server and resource pools,
+and to deploy, monitor, manage, and migrate virtual machines.
 
 XenCenter is written mostly in C#.
 
diff --git a/XenAdmin/Images/spacer1x1.gif b/XenAdmin/Images/spacer1x1.gif
deleted file mode 100644
index 1d11fa9ad..000000000
Binary files a/XenAdmin/Images/spacer1x1.gif and /dev/null differ
diff --git a/XenAdmin/Properties/Resources.Designer.cs b/XenAdmin/Properties/Resources.Designer.cs
index da327c9d7..e07acd4e7 100755
--- a/XenAdmin/Properties/Resources.Designer.cs
+++ b/XenAdmin/Properties/Resources.Designer.cs
@@ -1495,7 +1495,7 @@ namespace XenAdmin.Properties {
         /// </summary>
         internal static System.Drawing.Bitmap _000_WarningAlert_h32bit_32 {
             get {
-                object obj = ResourceManager.GetObject("000_WarningAlert_h32bit_32", resourceCulture);
+                object obj = ResourceManager.GetObject("_000_WarningAlert_h32bit_32", resourceCulture);
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
diff --git a/XenAdmin/Properties/Resources.resx b/XenAdmin/Properties/Resources.resx
index b45702afa..2da5b52b8 100755
--- a/XenAdmin/Properties/Resources.resx
+++ b/XenAdmin/Properties/Resources.resx
@@ -559,7 +559,7 @@
   <data name="alerts_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\..\Branding\Images\alerts_32.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
-  <data name="000_WarningAlert_h32bit_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
+  <data name="_000_WarningAlert_h32bit_32" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Images\000_WarningAlert_h32bit_32.png;System.Drawing.Bitmap, System.Drawing, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
   <data name="XS" type="System.Resources.ResXFileRef, System.Windows.Forms">
diff --git a/XenAdmin/XenAdmin.csproj b/XenAdmin/XenAdmin.csproj
index cbdc88d51..a469bef02 100755
--- a/XenAdmin/XenAdmin.csproj
+++ b/XenAdmin/XenAdmin.csproj
@@ -4336,6 +4336,7 @@
     <None Include="Images\000_RebootVM_h32bit_16.png" />
     <None Include="Images\000_RemoveIPAddress_h32bit_16.png" />
     <None Include="Images\000_RemoveSite_h32bit_16.png" />
+    <None Include="Images\000_Pool_h32bit_16-w-alert.png" />
     <Content Include="Images\000_ServerInProgress_h32bit_16.png" />
     <None Include="Images\000_ServerMaintenance_h32bit_16.png" />
     <None Include="Images\000_ServerMaintenance_h32bit_32.png" />
@@ -4401,6 +4402,7 @@
     <None Include="Images\001_WindowView_h32bit_16.png" />
     <None Include="Images\000_TestFailover_h32bit_32.png" />
     <None Include="Images\015_Download_h32bit_32.png" />
+    <None Include="Images\000_Server_h32bit_16-w-alert.png" />
     <Content Include="Images\000_Severity5_h32bit_16.png" />
     <None Include="Images\alert1_16.png" />
     <None Include="Images\alert2_16.png" />
@@ -4412,6 +4414,8 @@
       <Link>Images\alerts_32.png</Link>
     </Content>
     <Content Include="Images\000_Sites_h32bit_16.png" />
+    <None Include="Images\000_TCP-IPGroup_h32bit_16.png" />
+    <None Include="Images\015_Download_h32bit_16.png" />
     <Content Include="Images\asterisk.png" />
     <Content Include="Images\attach_24.png" />
     <None Include="Images\cancelled_action_16.png" />
@@ -4465,12 +4469,15 @@
     <None Include="Images\turbo_16x.png" />
     <None Include="Images\linx_16x.png" />
     <None Include="Images\yinhekylin_16x.png" />
+    <None Include="Images\pool_32.png" />
     <Content Include="Images\Refresh16.png" />
     <None Include="Images\saved_searches_16.png" />
     <None Include="Images\server_up_16.png" />
     <None Include="Images\saved_searches_24.png" />
     <None Include="Images\RunningDC_16.png" />
     <Content Include="Images\scilinux_16x.png" />
+    <None Include="Images\server_32.png" />
+    <None Include="Images\server_up_32.png" />
     <Content Include="Images\sl_luns_16.png" />
     <Content Include="Images\debian_16x.png" />
     <None Include="Images\desktop.jpg" />
@@ -4515,9 +4522,6 @@
     <None Include="Images\sl_pools_16.png" />
     <None Include="Images\sl_system_16.png" />
     <None Include="Images\sl_lun_16.png" />
-    <Content Include="Images\spacer1x1.gif">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
     <None Include="Images\SpinningFrame0.png" />
     <None Include="Images\SpinningFrame1.png" />
     <None Include="Images\SpinningFrame2.png" />
@@ -4527,6 +4531,7 @@
     <None Include="Images\SpinningFrame6.png" />
     <None Include="Images\SpinningFrame7.png" />
     <None Include="Images\StoppedDC_16.png" />
+    <None Include="Images\storage_error_16.png" />
     <Content Include="Images\subscribe.png" />
     <Content Include="Images\suse_16x.png" />
     <Content Include="Images\tempAdd.png" />
@@ -4558,42 +4563,19 @@
     <Content Include="Images\tshadowtopright.png" />
     <Content Include="Images\ubuntu_16x.png" />
     <Content Include="..\Branding\Images\upsell_16.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
       <Link>Images\upsell_16.png</Link>
     </Content>
-    <Content Include="Images\usagebar_0.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\usagebar_1.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\usagebar_10.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\usagebar_2.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\usagebar_3.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\usagebar_4.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\usagebar_5.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\usagebar_6.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\usagebar_7.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\usagebar_8.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
-    <Content Include="Images\usagebar_9.png">
-      <CopyToOutputDirectory>Always</CopyToOutputDirectory>
-    </Content>
+    <Content Include="Images\usagebar_0.png" />
+    <Content Include="Images\usagebar_1.png" />
+    <Content Include="Images\usagebar_10.png" />
+    <Content Include="Images\usagebar_2.png" />
+    <Content Include="Images\usagebar_3.png" />
+    <Content Include="Images\usagebar_4.png" />
+    <Content Include="Images\usagebar_5.png" />
+    <Content Include="Images\usagebar_6.png" />
+    <Content Include="Images\usagebar_7.png" />
+    <Content Include="Images\usagebar_8.png" />
+    <Content Include="Images\usagebar_9.png" />
     <None Include="Images\virtualstorage_snapshot_16.png" />
     <None Include="Images\vmBackgroundCurrent.png" />
     <None Include="Images\vmBackground.png" />