diff --git a/mRemoteV1/UI/Window/ErrorAndInfoWindow.Designer.cs b/mRemoteV1/UI/Window/ErrorAndInfoWindow.Designer.cs
index e354e56b..e77d7c37 100644
--- a/mRemoteV1/UI/Window/ErrorAndInfoWindow.Designer.cs
+++ b/mRemoteV1/UI/Window/ErrorAndInfoWindow.Designer.cs
@@ -3,7 +3,7 @@ namespace mRemoteNG.UI.Window
 {
 	public partial class ErrorAndInfoWindow
 	{
-		internal System.Windows.Forms.PictureBox pbError;
+		internal Controls.Base.NGPictureBox pbError;
 		internal System.Windows.Forms.ListView lvErrorCollector;
 		internal System.Windows.Forms.ColumnHeader clmMessage;
 		internal Controls.Base.NGTextBox txtMsgText;
@@ -16,7 +16,7 @@ namespace mRemoteNG.UI.Window
 		{
             this.components = new System.ComponentModel.Container();
             this.txtMsgText = new mRemoteNG.UI.Controls.Base.NGTextBox();
-            this.pbError = new System.Windows.Forms.PictureBox();
+            this.pbError = new Controls.Base.NGPictureBox();
             this.lvErrorCollector = new System.Windows.Forms.ListView();
             this.clmMessage = ((System.Windows.Forms.ColumnHeader)(new System.Windows.Forms.ColumnHeader()));
             this.cMenMC = new System.Windows.Forms.ContextMenuStrip(this.components);
diff --git a/mRemoteV1/UI/Window/ErrorAndInfoWindow.cs b/mRemoteV1/UI/Window/ErrorAndInfoWindow.cs
index 8fa17a8a..4d7099f3 100644
--- a/mRemoteV1/UI/Window/ErrorAndInfoWindow.cs
+++ b/mRemoteV1/UI/Window/ErrorAndInfoWindow.cs
@@ -36,12 +36,12 @@ namespace mRemoteNG.UI.Window
             _themeManager.ThemeChanged += ApplyTheme;
             LayoutVertical();
             FillImageList();
+            ApplyLanguage();
         }
 
         #region Form Stuff
         private void ErrorsAndInfos_Load(object sender, EventArgs e)
 		{
-			ApplyLanguage();
 		}
 				
 		private void ApplyLanguage()
@@ -60,6 +60,13 @@ namespace mRemoteNG.UI.Window
             if (!_themeManager.ThemingActive) return;
             lvErrorCollector.BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("TextBox_Background");
             lvErrorCollector.ForeColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("TextBox_Foreground");
+
+            pnlErrorMsg.BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("Dialog_Background");
+            pnlErrorMsg.ForeColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("Dialog_Foreground");
+            txtMsgText.BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("TextBox_Background");
+            txtMsgText.ForeColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("TextBox_Foreground");
+            lblMsgDate.BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("Dialog_Background");
+            lblMsgDate.ForeColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("Dialog_Foreground");
         }
 
         private void FillImageList()
@@ -143,11 +150,11 @@ namespace mRemoteNG.UI.Window
 		{
 			try
 			{
-				pnlErrorMsg.BackColor = Color.FromKnownColor(KnownColor.Control);
-				pbError.Image = null;
-				txtMsgText.BackColor = Color.FromKnownColor(KnownColor.Control);
-				txtMsgText.Text = "";
-                lblMsgDate.BackColor = Color.FromKnownColor(KnownColor.Control);
+				pnlErrorMsg.BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("Dialog_Background");
+                pbError.Image = null;
+				txtMsgText.BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("TextBox_Background");
+                txtMsgText.Text = "";
+                lblMsgDate.BackColor = _themeManager.ActiveTheme.ExtendedPalette.getColor("Dialog_Background");
                 lblMsgDate.Text = "";
 			}
 			catch (Exception ex)