diff --git a/mRemoteV1/Connection/AbstractConnectionRecord.cs b/mRemoteV1/Connection/AbstractConnectionRecord.cs
index b9f41dd4..17c26bea 100644
--- a/mRemoteV1/Connection/AbstractConnectionRecord.cs
+++ b/mRemoteV1/Connection/AbstractConnectionRecord.cs
@@ -531,7 +531,7 @@ namespace mRemoteNG.Connection
          LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameDisableFullWindowDrag)),
          LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionDisableFullWindowDrag)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         UsedInProtocol(ProtocolType.RDP)]
+         AttributeUsedInProtocol(ProtocolType.RDP)]
         public bool DisableFullWindowDrag
         {
             get => GetPropertyValue("DisableFullWindowDrag", _disableFullWindowDrag);
@@ -542,7 +542,7 @@ namespace mRemoteNG.Connection
          LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameDisableMenuAnimations)),
          LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionDisableMenuAnimations)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         UsedInProtocol(ProtocolType.RDP)]
+         AttributeUsedInProtocol(ProtocolType.RDP)]
         public bool DisableMenuAnimations
         {
             get => GetPropertyValue("DisableMenuAnimations", _disableMenuAnimations);
@@ -553,7 +553,7 @@ namespace mRemoteNG.Connection
          LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameDisableCursorShadow)),
          LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionDisableCursorShadow)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         UsedInProtocol(ProtocolType.RDP)]
+         AttributeUsedInProtocol(ProtocolType.RDP)]
         public bool DisableCursorShadow
         {
             get => GetPropertyValue("DisableCursorShadow", _disableCursorShadow);
@@ -564,7 +564,7 @@ namespace mRemoteNG.Connection
          LocalizedAttributes.LocalizedDisplayName(nameof(Language.strPropertyNameDisableCursorShadow)),
          LocalizedAttributes.LocalizedDescription(nameof(Language.strPropertyDescriptionDisableCursorShadow)),
          TypeConverter(typeof(MiscTools.YesNoTypeConverter)),
-         UsedInProtocol(ProtocolType.RDP)]
+         AttributeUsedInProtocol(ProtocolType.RDP)]
         public bool DisableCursorBlinking
         {
             get => GetPropertyValue("DisableCursorBlinking", _disableCursorBlinking);
diff --git a/mRemoteV1/UI/Forms/OptionsPages/ComponentsPage.cs b/mRemoteV1/UI/Forms/OptionsPages/ComponentsPage.cs
index 530fed5a..a59da90e 100644
--- a/mRemoteV1/UI/Forms/OptionsPages/ComponentsPage.cs
+++ b/mRemoteV1/UI/Forms/OptionsPages/ComponentsPage.cs
@@ -4,7 +4,6 @@ using System.Drawing;
 using System.IO;
 using System.Linq;
 using System.Threading;
-using AxWFICALib;
 using Gecko;
 using mRemoteNG.App;
 using mRemoteNG.App.Info;
@@ -55,7 +54,6 @@ namespace mRemoteNG.UI.Forms.OptionsPages
             CheckRdp();
             CheckVnc();
             CheckPutty();
-            CheckIca();
             CheckGeckoBrowser();
             Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "Finished component check", true);
         }
@@ -159,36 +157,6 @@ namespace mRemoteNG.UI.Forms.OptionsPages
             }
         }
 
-        private void CheckIca()
-        {
-            pnlCheck4.Visible = true;
-
-            try
-            {
-                using (var ica = new AxICAClient())
-                {
-                    ica.Parent = this;
-
-                    pbCheck4.Image = Resources.Good_Symbol;
-                    lblCheck4.ForeColor = Color.DarkOliveGreen;
-                    lblCheck4.Text = @"ICA (Citrix ICA) " + Language.strCcCheckSucceeded;
-                    txtCheck4.Text = string.Format(Language.strCcICAOK, ica.Version);
-                    Runtime.MessageCollector.AddMessage(MessageClass.InformationMsg, "ICA installed", true);
-                }
-            }
-            catch (Exception ex)
-            {
-                pbCheck4.Image = Resources.Bad_Symbol;
-                lblCheck4.ForeColor = Color.Firebrick;
-                lblCheck4.Text = @"ICA (Citrix ICA) " + Language.strCcCheckFailed;
-                txtCheck4.Text = string.Format(Language.strCcICAFailed, GeneralAppInfo.UrlForum);
-
-                Runtime.MessageCollector.AddMessage(MessageClass.WarningMsg,
-                                                    "ICA " + Language.strCcNotInstalledProperly, true);
-                Runtime.MessageCollector.AddMessage(MessageClass.ErrorMsg, ex.Message, true);
-            }
-        }
-
         private void CheckGeckoBrowser()
         {
             pnlCheck5.Visible = true;
diff --git a/mRemoteV1/mRemoteV1.csproj b/mRemoteV1/mRemoteV1.csproj
index aaa65343..5644eefa 100644
--- a/mRemoteV1/mRemoteV1.csproj
+++ b/mRemoteV1/mRemoteV1.csproj
@@ -347,7 +347,7 @@
     <Compile Include="Themes\MremoteNGThemeBase.cs">
       <SubType>Component</SubType>
     </Compile>
-    <Compile Include="Tools\Attributes\UsedInAllProtocolsExceptAttribute.cs" />
+    <Compile Include="Tools\Attributes\AttributeUsedInAllProtocolsExcept.cs" />
     <Compile Include="Tools\Clipboard\WindowsClipboard.cs" />
     <Compile Include="Tools\CustomCollections\IFullyNotifiableList.cs" />
     <Compile Include="Tools\CustomCollections\FullyObservableCollection.cs" />