diff --git a/XenAdmin/AppIcon.ico b/XenAdmin/AppIcon.ico
new file mode 100644
index 000000000..e95e7e68f
Binary files /dev/null and b/XenAdmin/AppIcon.ico differ
diff --git a/XenAdmin/Dialogs/ConversionDialog.cs b/XenAdmin/Dialogs/ConversionDialog.cs
index f25ad7698..8175a7723 100644
--- a/XenAdmin/Dialogs/ConversionDialog.cs
+++ b/XenAdmin/Dialogs/ConversionDialog.cs
@@ -307,7 +307,7 @@ namespace XenAdmin.Dialogs
                         return;
                     }
 
-                    statusLabel.Image = Images.StaticImages.xcm;
+                    //statusLabel.Image = Images.StaticImages.xcm;
                     statusLabel.Text = Messages.CONVERSION_CONNECTING_VPX_SUCCESS;
                     statusLinkLabel.Reset();
 
diff --git a/XenAdmin/Images.cs b/XenAdmin/Images.cs
index 653ef401c..fe60a809a 100644
--- a/XenAdmin/Images.cs
+++ b/XenAdmin/Images.cs
@@ -967,8 +967,6 @@ namespace XenAdmin
             public static Bitmap vnc_local_cursor = Properties.Resources.vnc_local_cursor;
             public static Bitmap windows_h32bit_16 = Properties.Resources.windows_h32bit_16;
             public static Bitmap wizard_background = Properties.Resources.wizard_background;
-            public static Bitmap xcm = Properties.Resources.xcm;
-            public static Bitmap xcm_32x32 = Properties.Resources.xcm_32x32;
             public static Bitmap queued = Properties.Resources.queued;
             public static Bitmap _000_User_h32bit_32 = Properties.Resources._000_User_h32bit_32;
             public static Bitmap asianux_16x = Properties.Resources.asianux_16x;
diff --git a/XenAdmin/Properties/Resources.Designer.cs b/XenAdmin/Properties/Resources.Designer.cs
index bbffafd0c..065bb10b9 100644
--- a/XenAdmin/Properties/Resources.Designer.cs
+++ b/XenAdmin/Properties/Resources.Designer.cs
@@ -15,10 +15,10 @@ namespace XenAdmin.Properties {
     /// <summary>
     ///   Eine stark typisierte Ressourcenklasse zum Suchen von lokalisierten Zeichenfolgen usw.
     /// </summary>
-    // This class was auto-generated by the StronglyTypedResourceBuilder
-    // class via a tool like ResGen or Visual Studio.
-    // To add or remove a member, edit your .ResX file then rerun ResGen
-    // with the /str option, or rebuild your VS project.
+    // Diese Klasse wurde von der StronglyTypedResourceBuilder automatisch generiert
+    // -Klasse über ein Tool wie ResGen oder Visual Studio automatisch generiert.
+    // Um einen Member hinzuzufügen oder zu entfernen, bearbeiten Sie die .ResX-Datei und führen dann ResGen
+    // mit der /str-Option erneut aus, oder Sie erstellen Ihr VS-Projekt neu.
     [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
@@ -71,7 +71,7 @@ namespace XenAdmin.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _000_Abort_h32bit_16 {
             get {
@@ -1281,7 +1281,7 @@ namespace XenAdmin.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _000_ToolBar_Pref_Icon_dis {
             get {
@@ -1811,7 +1811,7 @@ namespace XenAdmin.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap _015_Download_h32bit_32 {
             get {
@@ -1941,7 +1941,7 @@ namespace XenAdmin.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Icon ähnlich wie (Symbol).
         /// </summary>
         internal static System.Drawing.Icon AppIcon {
             get {
@@ -2261,7 +2261,7 @@ namespace XenAdmin.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap grab {
             get {
@@ -2351,20 +2351,25 @@ namespace XenAdmin.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.01//EN&quot; &quot;http://www.w3.org/TR/html4/strict.dtd&quot;&gt;
-        ///
-        ///&lt;!-- 
-        ///Copyright (c) Cloud Software Group, Inc. 
-        ///
-        ///Redistribution and use in source and binary forms,
-        ///with or without modification, are permitted provided
-        ///that the following conditions are met:
-        ///
-        ///*   Redistributions of source code must retain the above
-        ///    copyright notice, this list of conditions and the
-        ///    following disclaimer.
-        ///*   Redistributions in binary form must reproduce the above
-        ///    copyright not [rest of string was truncated]&quot;;.
+        ///   Sucht eine lokalisierte Zeichenfolge, die &lt;!DOCTYPE html PUBLIC &quot;-//W3C//DTD HTML 4.01//EN&quot; &quot;http://www.w3.org/TR/html4/strict.dtd&quot;&gt;
+        ///&lt;html&gt;
+        ///	&lt;body style=&quot;background-image: linear-gradient(white, lightgrey); background-repeat: no-repeat;&quot;&gt;
+        ///		&lt;center&gt;
+        ///  &lt;br/&gt;
+        ///  &lt;br/&gt;
+        ///  &lt;img id=&quot;addServer&quot; src=&quot;../../Branding/Images/xcp-ng-logo1glossy-1.png &quot; alt=&quot;Add a Server&quot;&gt;
+        ///  &lt;br/&gt;
+        ///  &lt;br/&gt;
+        ///  &lt;br/&gt;
+        ///  &lt;a href=&quot;xencenter://AddServer&quot;&gt;Add a Server&lt;/a&gt;
+        ///  &lt;br/&gt;
+        ///  &lt;br/&gt;
+        ///  &lt;br/&gt;
+        ///  &lt;br/&gt;
+        ///  &lt;br/&gt;
+        ///  &lt;/center&gt;
+        ///  &lt;/body&gt;
+        ///&lt;/html&gt; ähnelt.
         /// </summary>
         internal static string HomePage {
             get {
@@ -2373,7 +2378,7 @@ namespace XenAdmin.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap homepage_bullet {
             get {
@@ -2383,51 +2388,7 @@ namespace XenAdmin.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized string similar to &lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.01//EN&quot; &quot;http://www.w3.org/TR/html4/strict.dtd&quot;&gt;
-        ///
-        ///&lt;!-- 
-        ///Copyright (c) Cloud Software Group, Inc. 
-        ///
-        ///Redistribution and use in source and binary forms,
-        ///with or without modification, are permitted provided
-        ///that the following conditions are met:
-        ///
-        ///*   Redistributions of source code must retain the above
-        ///    copyright notice, this list of conditions and the
-        ///    following disclaimer.
-        ///*   Redistributions in binary form must reproduce the above
-        ///    copyright not [rest of string was truncated]&quot;;.
-        /// </summary>
-        internal static string HomePage_ja {
-            get {
-                return ResourceManager.GetString("HomePage_ja", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized string similar to &lt;!DOCTYPE HTML PUBLIC &quot;-//W3C//DTD HTML 4.01//EN&quot; &quot;http://www.w3.org/TR/html4/strict.dtd&quot;&gt;
-        ///
-        ///&lt;!-- 
-        ///Copyright (c) Cloud Software Group, Inc. 
-        ///
-        ///Redistribution and use in source and binary forms,
-        ///with or without modification, are permitted provided
-        ///that the following conditions are met:
-        ///
-        ///*   Redistributions of source code must retain the above
-        ///    copyright notice, this list of conditions and the
-        ///    following disclaimer.
-        ///*   Redistributions in binary form must reproduce the above
-        ///    copyright not [rest of string was truncated]&quot;;.
-        /// </summary>
-        internal static string HomePage_zh_CN {
-            get {
-                return ResourceManager.GetString("HomePage_zh_CN", resourceCulture);
-            }
-        }
-        
-        /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap import_32 {
             get {
@@ -2517,7 +2478,7 @@ namespace XenAdmin.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap log_destination_16 {
             get {
@@ -2907,7 +2868,7 @@ namespace XenAdmin.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap pool_up_16 {
             get {
@@ -2957,7 +2918,7 @@ namespace XenAdmin.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap rocky_16x {
             get {
@@ -2967,7 +2928,7 @@ namespace XenAdmin.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap rpm_package {
             get {
@@ -2977,7 +2938,7 @@ namespace XenAdmin.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap RunningDC_16 {
             get {
@@ -2997,7 +2958,7 @@ namespace XenAdmin.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap saved_searches_16 {
             get {
@@ -3247,7 +3208,7 @@ namespace XenAdmin.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap StoppedDC_16 {
             get {
@@ -3317,7 +3278,7 @@ namespace XenAdmin.Properties {
         }
         
         /// <summary>
-        ///   Looks up a localized resource of type System.Drawing.Bitmap.
+        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
         internal static System.Drawing.Bitmap tree_minus {
             get {
@@ -3596,26 +3557,6 @@ namespace XenAdmin.Properties {
             }
         }
         
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap xcm {
-            get {
-                object obj = ResourceManager.GetObject("xcm", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
-        /// <summary>
-        ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
-        /// </summary>
-        internal static System.Drawing.Bitmap xcm_32x32 {
-            get {
-                object obj = ResourceManager.GetObject("xcm_32x32", resourceCulture);
-                return ((System.Drawing.Bitmap)(obj));
-            }
-        }
-        
         /// <summary>
         ///   Sucht eine lokalisierte Ressource vom Typ System.Drawing.Bitmap.
         /// </summary>
diff --git a/XenAdmin/Properties/Resources.resx b/XenAdmin/Properties/Resources.resx
index 4b073d19c..35b07da37 100755
--- a/XenAdmin/Properties/Resources.resx
+++ b/XenAdmin/Properties/Resources.resx
@@ -1162,4 +1162,7 @@
   <data name="rpm_package" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Images\rpm_package.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="splash" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\splash.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/XenAdmin/Resources/splash.bmp b/XenAdmin/Resources/splash.bmp
new file mode 100644
index 000000000..47bccb741
Binary files /dev/null and b/XenAdmin/Resources/splash.bmp differ
diff --git a/XenAdmin/Resources/splash.png b/XenAdmin/Resources/splash.png
new file mode 100644
index 000000000..3e9d6ed41
Binary files /dev/null and b/XenAdmin/Resources/splash.png differ
diff --git a/XenAdmin/SplashScreen.Designer.cs b/XenAdmin/SplashScreen.Designer.cs
index c264a8b3a..fd7f643a9 100644
--- a/XenAdmin/SplashScreen.Designer.cs
+++ b/XenAdmin/SplashScreen.Designer.cs
@@ -32,7 +32,6 @@
             System.ComponentModel.ComponentResourceManager resources = new System.ComponentModel.ComponentResourceManager(typeof(SplashScreen));
             this.pictureBox1 = new System.Windows.Forms.PictureBox();
             this.timer1 = new System.Windows.Forms.Timer(this.components);
-            this.labelCopyright = new System.Windows.Forms.Label();
             ((System.ComponentModel.ISupportInitialize)(this.pictureBox1)).BeginInit();
             this.SuspendLayout();
             // 
@@ -47,18 +46,11 @@
             this.timer1.Interval = 2000;
             this.timer1.Tick += new System.EventHandler(this.timer1_Tick);
             // 
-            // labelCopyright
-            // 
-            this.labelCopyright.BackColor = System.Drawing.Color.Transparent;
-            resources.ApplyResources(this.labelCopyright, "labelCopyright");
-            this.labelCopyright.Name = "labelCopyright";
-            // 
             // SplashScreen
             // 
             resources.ApplyResources(this, "$this");
             this.AutoScaleMode = System.Windows.Forms.AutoScaleMode.Dpi;
             this.ControlBox = false;
-            this.Controls.Add(this.labelCopyright);
             this.Controls.Add(this.pictureBox1);
             this.FormBorderStyle = System.Windows.Forms.FormBorderStyle.None;
             this.Name = "SplashScreen";
@@ -74,7 +66,6 @@
 
         private System.Windows.Forms.PictureBox pictureBox1;
         private System.Windows.Forms.Timer timer1;
-        private System.Windows.Forms.Label labelCopyright;
     }
 }
 
diff --git a/XenAdmin/SplashScreen.cs b/XenAdmin/SplashScreen.cs
index 00d2376d1..83a501f09 100644
--- a/XenAdmin/SplashScreen.cs
+++ b/XenAdmin/SplashScreen.cs
@@ -45,12 +45,12 @@ namespace XenAdmin
         {
             InitializeComponent();
             pictureBox1.Image = Images.StaticImages.splash;
-            labelCopyright.Text = BrandManager.Copyright;
-            labelCopyright.ForeColor = Color.FromArgb(39, 52, 64);
+            //labelCopyright.Text = BrandManager.Copyright;
+            //labelCopyright.ForeColor = Color.FromArgb(39, 52, 64);
 
             //setting the parent is needed so the transparency can show
             //the picturebox content instead of the control behind it
-            labelCopyright.Parent = pictureBox1;
+            //labelCopyright.Parent = pictureBox1;
         }
 
         protected override void OnShown(EventArgs e)
diff --git a/XenAdmin/SplashScreen.resx b/XenAdmin/SplashScreen.resx
index 46cee6e4a..f2fdb89eb 100644
--- a/XenAdmin/SplashScreen.resx
+++ b/XenAdmin/SplashScreen.resx
@@ -126,7 +126,7 @@
     <value>0, 0, 0, 0</value>
   </data>
   <data name="pictureBox1.Size" type="System.Drawing.Size, System.Drawing">
-    <value>500, 375</value>
+    <value>830, 434</value>
   </data>
   <assembly alias="mscorlib" name="mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
   <data name="pictureBox1.TabIndex" type="System.Int32, mscorlib">
@@ -142,46 +142,16 @@
     <value>$this</value>
   </data>
   <data name="&gt;&gt;pictureBox1.ZOrder" xml:space="preserve">
-    <value>1</value>
+    <value>0</value>
   </data>
   <metadata name="timer1.TrayLocation" type="System.Drawing.Point, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a">
     <value>17, 17</value>
   </metadata>
-  <data name="labelCopyright.Font" type="System.Drawing.Font, System.Drawing">
-    <value>Microsoft Sans Serif, 8.25pt, style=Bold</value>
-  </data>
-  <data name="labelCopyright.Location" type="System.Drawing.Point, System.Drawing">
-    <value>12, 336</value>
-  </data>
-  <data name="labelCopyright.Size" type="System.Drawing.Size, System.Drawing">
-    <value>475, 22</value>
-  </data>
-  <data name="labelCopyright.TabIndex" type="System.Int32, mscorlib">
-    <value>1</value>
-  </data>
-  <data name="labelCopyright.Text" xml:space="preserve">
-    <value>copyright</value>
-  </data>
-  <data name="labelCopyright.TextAlign" type="System.Drawing.ContentAlignment, System.Drawing">
-    <value>MiddleCenter</value>
-  </data>
-  <data name="&gt;&gt;labelCopyright.Name" xml:space="preserve">
-    <value>labelCopyright</value>
-  </data>
-  <data name="&gt;&gt;labelCopyright.Type" xml:space="preserve">
-    <value>System.Windows.Forms.Label, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
-  </data>
-  <data name="&gt;&gt;labelCopyright.Parent" xml:space="preserve">
-    <value>$this</value>
-  </data>
-  <data name="&gt;&gt;labelCopyright.ZOrder" xml:space="preserve">
-    <value>0</value>
-  </data>
   <metadata name="$this.Localizable" type="System.Boolean, mscorlib, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089">
     <value>True</value>
   </metadata>
   <data name="$this.AutoScaleDimensions" type="System.Drawing.SizeF, System.Drawing">
-    <value>96, 96</value>
+    <value>192, 192</value>
   </data>
   <data name="$this.AutoSize" type="System.Boolean, mscorlib">
     <value>True</value>
@@ -190,7 +160,10 @@
     <value>GrowAndShrink</value>
   </data>
   <data name="$this.ClientSize" type="System.Drawing.Size, System.Drawing">
-    <value>544, 416</value>
+    <value>830, 434</value>
+  </data>
+  <data name="$this.Margin" type="System.Windows.Forms.Padding, System.Windows.Forms">
+    <value>6, 6, 6, 6</value>
   </data>
   <data name="$this.StartPosition" type="System.Windows.Forms.FormStartPosition, System.Windows.Forms">
     <value>CenterScreen</value>
diff --git a/XenAdmin/TabPages/HomePage.cs b/XenAdmin/TabPages/HomePage.cs
index 735140b1b..2a0828dcf 100644
--- a/XenAdmin/TabPages/HomePage.cs
+++ b/XenAdmin/TabPages/HomePage.cs
@@ -50,12 +50,6 @@ namespace XenAdmin.TabPages
 
             switch (Program.CurrentLanguage)
             {
-                case "ja":
-                    _html = Properties.Resources.HomePage_ja;
-                    break;
-                case "zh":
-                    _html = Properties.Resources.HomePage_zh_CN;
-                    break;
                 default:
                     _html = Properties.Resources.HomePage;
                     break;
diff --git a/XenAdmin/Wizards/ConversionWizard/ConversionWizard.cs b/XenAdmin/Wizards/ConversionWizard/ConversionWizard.cs
index babc6965d..2916e2250 100644
--- a/XenAdmin/Wizards/ConversionWizard/ConversionWizard.cs
+++ b/XenAdmin/Wizards/ConversionWizard/ConversionWizard.cs
@@ -56,7 +56,7 @@ namespace XenAdmin.Wizards.ConversionWizard
         public ConversionWizard(ConversionClient client)
             : base(client.Connection)
         {
-            pictureBoxWizard.Image = Images.StaticImages.xcm_32x32;
+            //pictureBoxWizard.Image = Images.StaticImages.xcm_32x32;
            
             _conversionClient = client;
 
diff --git a/XenAdmin/XenAdmin.csproj b/XenAdmin/XenAdmin.csproj
index fcb953bed..3ebdc6159 100755
--- a/XenAdmin/XenAdmin.csproj
+++ b/XenAdmin/XenAdmin.csproj
@@ -6716,6 +6716,8 @@
       <DependentUpon>WorkloadReports.cs</DependentUpon>
     </EmbeddedResource>
     <None Include="Images\VMTemplate_h32bit_32.png" />
+    <None Include="Resources\splash.png" />
+    <None Include="Resources\splash.bmp" />
     <Content Include="TestResources\console.png">
       <CopyToOutputDirectory>PreserveNewest</CopyToOutputDirectory>
     </Content>
diff --git a/XenModel/Actions/Healthcheck/DisableHealthCheckAction.cs b/XenModel/Actions/Healthcheck/DisableHealthCheckAction.cs
new file mode 100644
index 000000000..93fcda347
--- /dev/null
+++ b/XenModel/Actions/Healthcheck/DisableHealthCheckAction.cs
@@ -0,0 +1,54 @@
+/* Copyright (c) Cloud Software Group, Inc. 
+ * 
+ * Redistribution and use in source and binary forms, 
+ * with or without modification, are permitted provided 
+ * that the following conditions are met: 
+ * 
+ * *   Redistributions of source code must retain the above 
+ *     copyright notice, this list of conditions and the 
+ *     following disclaimer. 
+ * *   Redistributions in binary form must reproduce the above 
+ *     copyright notice, this list of conditions and the 
+ *     following disclaimer in the documentation and/or other 
+ *     materials provided with the distribution. 
+ * 
+ * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND 
+ * CONTRIBUTORS "AS IS" AND ANY EXPRESS OR IMPLIED WARRANTIES, 
+ * INCLUDING, BUT NOT LIMITED TO, THE IMPLIED WARRANTIES OF 
+ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE ARE 
+ * DISCLAIMED. IN NO EVENT SHALL THE COPYRIGHT HOLDER OR 
+ * CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL, 
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, 
+ * BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR 
+ * SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS 
+ * INTERRUPTION) HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, 
+ * WHETHER IN CONTRACT, STRICT LIABILITY, OR TORT (INCLUDING 
+ * NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE 
+ * OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF 
+ * SUCH DAMAGE.
+ */
+
+using System.Collections.Generic;
+using XenAPI;
+
+
+namespace XenAdmin.Actions
+{
+    public class DisableHealthCheckAction : AsyncAction
+    {
+        public DisableHealthCheckAction(Pool pool)
+            : base(pool.Connection, Messages.ACTION_DISABLE_HEALTH_CHECK_TITLE, "", false)
+        {
+            Pool = pool;
+            ApiMethodsToRoleCheck.Add("pool.set_health_check_config");
+            Description = string.Format(Messages.ACTION_DISABLE_HEALTH_CHECK_DESCRIPTION, pool.Name());
+        }
+
+        protected override void Run()
+        {
+            Pool.set_health_check_config(Session, Pool.opaque_ref, new Dictionary<string, string>());
+            Connection.WaitFor(() => Pool.GetHealthCheckStatus() != Pool.HealthCheckStatus.Enabled, null);
+        }
+    }
+}
+
diff --git a/XenModel/Branding.resx b/XenModel/Branding.resx
new file mode 100644
index 000000000..fd9212251
--- /dev/null
+++ b/XenModel/Branding.resx
@@ -0,0 +1,177 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CIS" xml:space="preserve">
+    <value>Citrix Insight Services</value>
+  </data>
+  <data name="COMPANY_NAME_LEGACY" xml:space="preserve">
+    <value>Citrix</value>
+  </data>
+  <data name="COPYRIGHT" xml:space="preserve">
+    <value>Copyright (c) 2023 XCP-ng Project\nCopyright © 2007-2023 Cloud Software Group, Inc. All Rights Reserved.</value>
+  </data>
+  <data name="EXTENSION_BACKUP" xml:space="preserve">
+    <value>xbk</value>
+  </data>
+  <data name="EXTENSION_SEARCH" xml:space="preserve">
+    <value>xensearch</value>
+  </data>
+  <data name="EXTENSION_UPDATE" xml:space="preserve">
+    <value>xsupdate</value>
+  </data>
+  <data name="HELP_PATH" xml:space="preserve">
+    <value>xencenter/current-release/</value>
+  </data>
+  <data name="LEGACY_PRODUCT" xml:space="preserve">
+    <value>Citrix Hypervisor</value>
+  </data>
+  <data name="PERF_ALERT_MAIL_DEFAULT_LANGUAGE" xml:space="preserve">
+    <value>en-US</value>
+  </data>
+  <data name="PRODUCT_VERSION_7_0" xml:space="preserve">
+    <value>XenServer 7.0</value>
+  </data>
+  <data name="PRODUCT_VERSION_7_0_SHORT" xml:space="preserve">
+    <value>7.0</value>
+  </data>
+  <data name="PRODUCT_VERSION_7_1_2" xml:space="preserve">
+    <value>XenServer 7.1 CU2</value>
+  </data>
+  <data name="PRODUCT_VERSION_7_1_2_SHORT" xml:space="preserve">
+    <value>7.1.2</value>
+  </data>
+  <data name="PRODUCT_VERSION_8_0" xml:space="preserve">
+    <value>Citrix Hypervisor 8.0</value>
+  </data>
+  <data name="PRODUCT_VERSION_8_1" xml:space="preserve">
+    <value>Citrix Hypervisor 8.1</value>
+  </data>
+  <data name="PRODUCT_VERSION_8_2" xml:space="preserve">
+    <value>Citrix Hypervisor 8.2</value>
+  </data>
+  <data name="PRODUCT_VERSION_8_2_1" xml:space="preserve">
+    <value>Citrix Hypervisor 8.2 CU1</value>
+  </data>
+  <data name="PRODUCT_VERSION_8_2_SHORT" xml:space="preserve">
+    <value>8.2</value>
+  </data>
+  <data name="TRADEMARKS" xml:space="preserve">
+    <value>XenServer, Xen, the Xen logo, Citrix, Citrix Hypervisor, Citrix Cloud, Citrix Virtual Apps and Desktops, Citrix Virtual Desktops, XenApp and XenDesktop, XenDesktop, are either registered trademarks or trademarks of Cloud Software Group, Inc., and/or its subsidiaries in the United States and/or other countries. XenServer High Availability is powered by everRun, a registered trademark of Stratus Technologies Bermuda Limited.</value>
+  </data>
+</root>
\ No newline at end of file
diff --git a/XenModel/FriendlyNames.Designer.cs b/XenModel/FriendlyNames.Designer.cs
index 5380d5bb8..b149eefa9 100644
--- a/XenModel/FriendlyNames.Designer.cs
+++ b/XenModel/FriendlyNames.Designer.cs
@@ -1059,6 +1059,15 @@ namespace XenAdmin {
             }
         }
         
+        /// <summary>
+        ///   Sucht eine lokalisierte Zeichenfolge, die XCP-ng ähnelt.
+        /// </summary>
+        public static string Label_host_edition_xcp_ng {
+            get {
+                return ResourceManager.GetString("Label-host.edition-xcp-ng", resourceCulture);
+            }
+        }
+        
         /// <summary>
         ///   Sucht eine lokalisierte Zeichenfolge, die {0} for Citrix Virtual Desktops ähnelt.
         /// </summary>
diff --git a/XenModel/FriendlyNames.resx b/XenModel/FriendlyNames.resx
index f61bb884d..50e857a98 100644
--- a/XenModel/FriendlyNames.resx
+++ b/XenModel/FriendlyNames.resx
@@ -2021,4 +2021,7 @@
   <data name="Label-SR.SRTypes-xfs" xml:space="preserve">
     <value>XFS</value>
   </data>
+  <data name="Label-host.edition-xcp-ng" xml:space="preserve">
+    <value>XCP-ng</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/branding-xcp-ng/Branding.resx b/branding-xcp-ng/Branding.resx
new file mode 100644
index 000000000..5667973be
--- /dev/null
+++ b/branding-xcp-ng/Branding.resx
@@ -0,0 +1,178 @@
+<?xml version="1.0" encoding="utf-8"?>
+<root>
+  <!-- 
+    Microsoft ResX Schema 
+    
+    Version 2.0
+    
+    The primary goals of this format is to allow a simple XML format 
+    that is mostly human readable. The generation and parsing of the 
+    various data types are done through the TypeConverter classes 
+    associated with the data types.
+    
+    Example:
+    
+    ... ado.net/XML headers & schema ...
+    <resheader name="resmimetype">text/microsoft-resx</resheader>
+    <resheader name="version">2.0</resheader>
+    <resheader name="reader">System.Resources.ResXResourceReader, System.Windows.Forms, ...</resheader>
+    <resheader name="writer">System.Resources.ResXResourceWriter, System.Windows.Forms, ...</resheader>
+    <data name="Name1"><value>this is my long string</value><comment>this is a comment</comment></data>
+    <data name="Color1" type="System.Drawing.Color, System.Drawing">Blue</data>
+    <data name="Bitmap1" mimetype="application/x-microsoft.net.object.binary.base64">
+        <value>[base64 mime encoded serialized .NET Framework object]</value>
+    </data>
+    <data name="Icon1" type="System.Drawing.Icon, System.Drawing" mimetype="application/x-microsoft.net.object.bytearray.base64">
+        <value>[base64 mime encoded string representing a byte array form of the .NET Framework object]</value>
+        <comment>This is a comment</comment>
+    </data>
+                
+    There are any number of "resheader" rows that contain simple 
+    name/value pairs.
+    
+    Each data row contains a name, and value. The row also contains a 
+    type or mimetype. Type corresponds to a .NET class that support 
+    text/value conversion through the TypeConverter architecture. 
+    Classes that don't support this are serialized and stored with the 
+    mimetype set.
+    
+    The mimetype is used for serialized objects, and tells the 
+    ResXResourceReader how to depersist the object. This is currently not 
+    extensible. For a given mimetype the value must be set accordingly:
+    
+    Note - application/x-microsoft.net.object.binary.base64 is the format 
+    that the ResXResourceWriter will generate, however the reader can 
+    read any of the formats listed below.
+    
+    mimetype: application/x-microsoft.net.object.binary.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
+            : and then encoded with base64 encoding.
+    
+    mimetype: application/x-microsoft.net.object.soap.base64
+    value   : The object must be serialized with 
+            : System.Runtime.Serialization.Formatters.Soap.SoapFormatter
+            : and then encoded with base64 encoding.
+
+    mimetype: application/x-microsoft.net.object.bytearray.base64
+    value   : The object must be serialized into a byte array 
+            : using a System.ComponentModel.TypeConverter
+            : and then encoded with base64 encoding.
+    -->
+  <xsd:schema id="root" xmlns="" xmlns:xsd="http://www.w3.org/2001/XMLSchema" xmlns:msdata="urn:schemas-microsoft-com:xml-msdata">
+    <xsd:import namespace="http://www.w3.org/XML/1998/namespace" />
+    <xsd:element name="root" msdata:IsDataSet="true">
+      <xsd:complexType>
+        <xsd:choice maxOccurs="unbounded">
+          <xsd:element name="metadata">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" />
+              </xsd:sequence>
+              <xsd:attribute name="name" use="required" type="xsd:string" />
+              <xsd:attribute name="type" type="xsd:string" />
+              <xsd:attribute name="mimetype" type="xsd:string" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="assembly">
+            <xsd:complexType>
+              <xsd:attribute name="alias" type="xsd:string" />
+              <xsd:attribute name="name" type="xsd:string" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="data">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+                <xsd:element name="comment" type="xsd:string" minOccurs="0" msdata:Ordinal="2" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" msdata:Ordinal="1" />
+              <xsd:attribute name="type" type="xsd:string" msdata:Ordinal="3" />
+              <xsd:attribute name="mimetype" type="xsd:string" msdata:Ordinal="4" />
+              <xsd:attribute ref="xml:space" />
+            </xsd:complexType>
+          </xsd:element>
+          <xsd:element name="resheader">
+            <xsd:complexType>
+              <xsd:sequence>
+                <xsd:element name="value" type="xsd:string" minOccurs="0" msdata:Ordinal="1" />
+              </xsd:sequence>
+              <xsd:attribute name="name" type="xsd:string" use="required" />
+            </xsd:complexType>
+          </xsd:element>
+        </xsd:choice>
+      </xsd:complexType>
+    </xsd:element>
+  </xsd:schema>
+  <resheader name="resmimetype">
+    <value>text/microsoft-resx</value>
+  </resheader>
+  <resheader name="version">
+    <value>2.0</value>
+  </resheader>
+  <resheader name="reader">
+    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <resheader name="writer">
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+  </resheader>
+  <data name="CIS" xml:space="preserve">
+    <value>Citrix Insight Services</value>
+  </data>
+  <data name="COMPANY_NAME_LEGACY" xml:space="preserve">
+    <value>Citrix</value>
+  </data>
+  <data name="COPYRIGHT" xml:space="preserve">
+    <value>Copyright &#xA9; 2007-2023 Cloud Software Group, Inc. All Rights Reserved.</value>
+  </data>
+  <data name="EXTENSION_BACKUP" xml:space="preserve">
+    <value>xbk</value>
+  </data>
+  <data name="EXTENSION_SEARCH" xml:space="preserve">
+    <value>xensearch</value>
+  </data>
+  <data name="EXTENSION_UPDATE" xml:space="preserve">
+    <value>xsupdate</value>
+  </data>
+  <data name="HELP_PATH" xml:space="preserve">
+    <value>xencenter/current-release/</value>
+  </data>
+  <data name="LEGACY_PRODUCT" xml:space="preserve">
+    <value>Citrix Hypervisor</value>
+  </data>
+  <data name="PERF_ALERT_MAIL_DEFAULT_LANGUAGE" xml:space="preserve">
+    <value>en-US</value>
+  </data>
+  <data name="PRODUCT_VERSION_7_0" xml:space="preserve">
+    <value>XenServer 7.0</value>
+  </data>
+  <data name="PRODUCT_VERSION_7_0_SHORT" xml:space="preserve">
+    <value>7.0</value>
+  </data>
+  <data name="PRODUCT_VERSION_7_1_2" xml:space="preserve">
+    <value>XenServer 7.1 CU2</value>
+  </data>
+  <data name="PRODUCT_VERSION_7_1_2_SHORT" xml:space="preserve">
+    <value>7.1.2</value>
+  </data>
+  <data name="PRODUCT_VERSION_8_0" xml:space="preserve">
+    <value>Citrix Hypervisor 8.0</value>
+  </data>
+  <data name="PRODUCT_VERSION_8_1" xml:space="preserve">
+    <value>Citrix Hypervisor 8.1</value>
+  </data>
+  <data name="PRODUCT_VERSION_8_2" xml:space="preserve">
+    <value>Citrix Hypervisor 8.2</value>
+  </data>
+  <data name="PRODUCT_VERSION_8_2_1" xml:space="preserve">
+    <value>Citrix Hypervisor 8.2 CU1</value>
+  </data>
+  <data name="PRODUCT_VERSION_8_2_SHORT" xml:space="preserve">
+    <value>8.2</value>
+  </data>
+  <data name="TRADEMARKS" xml:space="preserve">
+    <value>XenServer, Xen, the Xen logo, Citrix, Citrix Hypervisor, Citrix Cloud, Citrix Virtual Apps and Desktops, Citrix Virtual Desktops, XenApp and XenDesktop, XenDesktop, are either registered trademarks or trademarks of Cloud Software Group, Inc., and/or its subsidiaries in the United States and/or other countries. XenServer High Availability is powered by everRun, a registered trademark of Stratus Technologies Bermuda Limited.</value>
+  </data>
+
+</root>