diff --git a/AppDiagnostic/AppDiagnostic.csproj b/AppDiagnostic/AppDiagnostic.csproj
index 65f8e8e7a..cef866153 100644
--- a/AppDiagnostic/AppDiagnostic.csproj
+++ b/AppDiagnostic/AppDiagnostic.csproj
@@ -76,6 +76,7 @@
     <Compile Include="Properties\Resources.Designer.cs">
       <AutoGen>True</AutoGen>
       <DependentUpon>Resources.resx</DependentUpon>
+      <DesignTime>True</DesignTime>
     </Compile>
     <None Include="packages.config" />
     <None Include="Properties\Settings.settings">
@@ -97,5 +98,8 @@
       <Name>SharedComponents</Name>
     </ProjectReference>
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\TBF_icon.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
 </Project>
\ No newline at end of file
diff --git a/AppDiagnostic/MainForm.cs b/AppDiagnostic/MainForm.cs
index ee4f6b817..f7c0d093d 100644
--- a/AppDiagnostic/MainForm.cs
+++ b/AppDiagnostic/MainForm.cs
@@ -29,6 +29,8 @@ namespace AppDiagnostic
 
         public MainForm()
         {
+            this.Icon = Properties.Resources.TBF_icon;
+
             InitializeComponent();
 
             // Inicializujeme LogAdapter a priradíme ho k memoListView
diff --git a/AppDiagnostic/Properties/Resources.Designer.cs b/AppDiagnostic/Properties/Resources.Designer.cs
index 1b5dfe715..51721f7d2 100644
--- a/AppDiagnostic/Properties/Resources.Designer.cs
+++ b/AppDiagnostic/Properties/Resources.Designer.cs
@@ -8,10 +8,10 @@
 // </auto-generated>
 //------------------------------------------------------------------------------
 
-namespace AppDiagnostic.Properties
-{
-
-
+namespace AppDiagnostic.Properties {
+    using System;
+    
+    
     /// <summary>
     ///   A strongly-typed resource class, for looking up localized strings, etc.
     /// </summary>
@@ -19,53 +19,55 @@ namespace AppDiagnostic.Properties
     // 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.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
-    internal class Resources
-    {
-
+    internal class Resources {
+        
         private static global::System.Resources.ResourceManager resourceMan;
-
+        
         private static global::System.Globalization.CultureInfo resourceCulture;
-
+        
         [global::System.Diagnostics.CodeAnalysis.SuppressMessageAttribute("Microsoft.Performance", "CA1811:AvoidUncalledPrivateCode")]
-        internal Resources()
-        {
+        internal Resources() {
         }
-
+        
         /// <summary>
         ///   Returns the cached ResourceManager instance used by this class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Resources.ResourceManager ResourceManager
-        {
-            get
-            {
-                if ((resourceMan == null))
-                {
+        internal static global::System.Resources.ResourceManager ResourceManager {
+            get {
+                if (object.ReferenceEquals(resourceMan, null)) {
                     global::System.Resources.ResourceManager temp = new global::System.Resources.ResourceManager("AppDiagnostic.Properties.Resources", typeof(Resources).Assembly);
                     resourceMan = temp;
                 }
                 return resourceMan;
             }
         }
-
+        
         /// <summary>
         ///   Overrides the current thread's CurrentUICulture property for all
         ///   resource lookups using this strongly typed resource class.
         /// </summary>
         [global::System.ComponentModel.EditorBrowsableAttribute(global::System.ComponentModel.EditorBrowsableState.Advanced)]
-        internal static global::System.Globalization.CultureInfo Culture
-        {
-            get
-            {
+        internal static global::System.Globalization.CultureInfo Culture {
+            get {
                 return resourceCulture;
             }
-            set
-            {
+            set {
                 resourceCulture = value;
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
+        internal static System.Drawing.Icon TBF_icon {
+            get {
+                object obj = ResourceManager.GetObject("TBF_icon", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
     }
 }
diff --git a/AppDiagnostic/Properties/Resources.resx b/AppDiagnostic/Properties/Resources.resx
index 13b775f1d..1ce3c962e 100644
--- a/AppDiagnostic/Properties/Resources.resx
+++ b/AppDiagnostic/Properties/Resources.resx
@@ -46,7 +46,7 @@
     
     mimetype: application/x-microsoft.net.object.binary.base64
     value   : The object must be serialized with 
-            : System.Serialization.Formatters.Binary.BinaryFormatter
+            : System.Runtime.Serialization.Formatters.Binary.BinaryFormatter
             : and then encoded with base64 encoding.
     
     mimetype: application/x-microsoft.net.object.soap.base64
@@ -60,6 +60,7 @@
             : 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">
@@ -68,9 +69,10 @@
               <xsd:sequence>
                 <xsd:element name="value" type="xsd:string" minOccurs="0" />
               </xsd:sequence>
-              <xsd:attribute name="name" type="xsd:string" />
+              <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">
@@ -85,9 +87,10 @@
                 <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" msdata:Ordinal="1" />
+              <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">
@@ -109,9 +112,13 @@
     <value>2.0</value>
   </resheader>
   <resheader name="reader">
-    <value>System.Resources.ResXResourceReader, System.Windows.Forms, Version=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <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=2.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
+    <value>System.Resources.ResXResourceWriter, System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089</value>
   </resheader>
+  <assembly alias="System.Windows.Forms" name="System.Windows.Forms, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b77a5c561934e089" />
+  <data name="TBF_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TBF_icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/AppDiagnostic/Resources/TBF_icon.ico b/AppDiagnostic/Resources/TBF_icon.ico
new file mode 100644
index 000000000..bf67f539b
Binary files /dev/null and b/AppDiagnostic/Resources/TBF_icon.ico differ
diff --git a/Results/Forms/BatchResultsDlg.cs b/Results/Forms/BatchResultsDlg.cs
index 725441262..ec01aaa42 100644
--- a/Results/Forms/BatchResultsDlg.cs
+++ b/Results/Forms/BatchResultsDlg.cs
@@ -49,6 +49,8 @@ namespace Results.Forms
         {
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             firstEnabledControl = null;
             lastSizeChange = DateTime.Now;
             nrGroups = 1;
diff --git a/Results/Forms/ManualEntryConfigDlg.cs b/Results/Forms/ManualEntryConfigDlg.cs
index 98b3192f6..c67448dde 100644
--- a/Results/Forms/ManualEntryConfigDlg.cs
+++ b/Results/Forms/ManualEntryConfigDlg.cs
@@ -24,7 +24,10 @@ namespace Results.Forms
 		public ManualEntryConfigDlg()
 		{
 			InitializeComponent();
-			manualEntryConfigCtrl.Unlocked = true;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            manualEntryConfigCtrl.Unlocked = true;
 		}
 
 
diff --git a/Results/Forms/MoreWMResultsDlg.cs b/Results/Forms/MoreWMResultsDlg.cs
index c78544dd8..a66386737 100644
--- a/Results/Forms/MoreWMResultsDlg.cs
+++ b/Results/Forms/MoreWMResultsDlg.cs
@@ -25,6 +25,8 @@ namespace Results.Forms
         {
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             Localize();
 
             ShowAllResults(wm);
diff --git a/Results/Forms/ResultsConfigDlg.cs b/Results/Forms/ResultsConfigDlg.cs
index 2bea3374e..6544b01d7 100644
--- a/Results/Forms/ResultsConfigDlg.cs
+++ b/Results/Forms/ResultsConfigDlg.cs
@@ -35,7 +35,10 @@ namespace Results.Forms
 		public ResultsConfigDlg()
 		{
 			InitializeComponent();
-			resultsConfigCtrl.Unlocked = true;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            resultsConfigCtrl.Unlocked = true;
 		}
 
 
diff --git a/Results/Properties/Resources.Designer.cs b/Results/Properties/Resources.Designer.cs
index a3febc1fa..dc0c14ac1 100644
--- a/Results/Properties/Resources.Designer.cs
+++ b/Results/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace Results.Properties {
     // 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.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -69,5 +69,15 @@ namespace Results.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
+        internal static System.Drawing.Icon TBF_icon {
+            get {
+                object obj = ResourceManager.GetObject("TBF_icon", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
     }
 }
diff --git a/Results/Properties/Resources.resx b/Results/Properties/Resources.resx
index 0191a707d..f04250fde 100644
--- a/Results/Properties/Resources.resx
+++ b/Results/Properties/Resources.resx
@@ -121,4 +121,7 @@
   <data name="Headpic" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Resources\Headpic.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="TBF_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TBF_icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/Results/Resources/TBF_icon.ico b/Results/Resources/TBF_icon.ico
new file mode 100644
index 000000000..bf67f539b
Binary files /dev/null and b/Results/Resources/TBF_icon.ico differ
diff --git a/Results/Results.csproj b/Results/Results.csproj
index 06cf05a71..c19b74969 100644
--- a/Results/Results.csproj
+++ b/Results/Results.csproj
@@ -256,6 +256,7 @@
   <ItemGroup>
     <Content Include="Entities\PurchaseEntities\createPurchaseTables.sql" />
     <Content Include="Entities\PurchaseEntities\ImportPurchaseOrderTestData.sql" />
+    <None Include="Resources\TBF_icon.ico" />
   </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
diff --git a/SharedComponents/obj/Debug/net472/SharedComponents.GeneratedMSBuildEditorConfig.editorconfig b/SharedComponents/obj/Debug/net472/SharedComponents.GeneratedMSBuildEditorConfig.editorconfig
index a02128ff9..64e85c9ac 100644
--- a/SharedComponents/obj/Debug/net472/SharedComponents.GeneratedMSBuildEditorConfig.editorconfig
+++ b/SharedComponents/obj/Debug/net472/SharedComponents.GeneratedMSBuildEditorConfig.editorconfig
@@ -1,5 +1,8 @@
 is_global = true
 build_property.RootNamespace = SharedComponents
-build_property.ProjectDir = C:\Users\micha\git\tbf\SharedComponents\
+build_property.ProjectDir = C:\Sensus projects\LocalBranch_start_at_19.2.2026\tbf-exchange260123\tbf\SharedComponents\
 build_property.EnableComHosting = 
 build_property.EnableGeneratedComInterfaceComImportInterop = 
+build_property.CsWinRTUseWindowsUIXamlProjections = false
+build_property.EffectiveAnalysisLevelStyle = 
+build_property.EnableCodeStyleSeverity = 
diff --git a/SharedComponents/obj/SharedComponents.csproj.nuget.g.props b/SharedComponents/obj/SharedComponents.csproj.nuget.g.props
index 568c2629e..d780aba7f 100644
--- a/SharedComponents/obj/SharedComponents.csproj.nuget.g.props
+++ b/SharedComponents/obj/SharedComponents.csproj.nuget.g.props
@@ -5,11 +5,12 @@
     <RestoreTool Condition=" '$(RestoreTool)' == '' ">NuGet</RestoreTool>
     <ProjectAssetsFile Condition=" '$(ProjectAssetsFile)' == '' ">$(MSBuildThisFileDirectory)project.assets.json</ProjectAssetsFile>
     <NuGetPackageRoot Condition=" '$(NuGetPackageRoot)' == '' ">$(UserProfile)\.nuget\packages\</NuGetPackageRoot>
-    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\micha\.nuget\packages\</NuGetPackageFolders>
+    <NuGetPackageFolders Condition=" '$(NuGetPackageFolders)' == '' ">C:\Users\MFRNIAK\.nuget\packages\;C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages</NuGetPackageFolders>
     <NuGetProjectStyle Condition=" '$(NuGetProjectStyle)' == '' ">PackageReference</NuGetProjectStyle>
-    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">7.0.0</NuGetToolVersion>
+    <NuGetToolVersion Condition=" '$(NuGetToolVersion)' == '' ">6.14.0</NuGetToolVersion>
   </PropertyGroup>
   <ItemGroup Condition=" '$(ExcludeRestorePackageImports)' != 'true' ">
-    <SourceRoot Include="C:\Users\micha\.nuget\packages\" />
+    <SourceRoot Include="C:\Users\MFRNIAK\.nuget\packages\" />
+    <SourceRoot Include="C:\Program Files (x86)\Microsoft Visual Studio\Shared\NuGetPackages\" />
   </ItemGroup>
 </Project>
\ No newline at end of file
diff --git a/SharedDatabase/Forms/DoubleLoginDlg.cs b/SharedDatabase/Forms/DoubleLoginDlg.cs
index 2c74a8a20..bcab6546f 100644
--- a/SharedDatabase/Forms/DoubleLoginDlg.cs
+++ b/SharedDatabase/Forms/DoubleLoginDlg.cs
@@ -44,6 +44,8 @@ namespace SharedDatabase.Forms
         {
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             loginStatePictureBox1.Image = Properties.Resources.questionMark;
             loginStatePictureBox2.Image = Properties.Resources.questionMark;
             authorizedUser1 = null;
diff --git a/SharedDatabase/Forms/EditSelectedUser.cs b/SharedDatabase/Forms/EditSelectedUser.cs
index d0b662fd3..7c117cddf 100644
--- a/SharedDatabase/Forms/EditSelectedUser.cs
+++ b/SharedDatabase/Forms/EditSelectedUser.cs
@@ -31,6 +31,9 @@ namespace SharedDatabase.Forms
         public EditSelectedUser()
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             this.toolTip1.SetToolTip(this.txtName, string.Format(Strings.max_0_alphanum_chars, 20));
             oriGroupMember = new bool[(displayedGroups != null) ? displayedGroups.Count : 0];
             okBtn.Enabled = false;
diff --git a/SharedDatabase/Forms/LoginDlg.cs b/SharedDatabase/Forms/LoginDlg.cs
index f2a1b1100..773b92ee1 100644
--- a/SharedDatabase/Forms/LoginDlg.cs
+++ b/SharedDatabase/Forms/LoginDlg.cs
@@ -45,6 +45,8 @@ namespace SharedDatabase.Forms
         {
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             oriBackColor = BackColor;
         }
 
diff --git a/SharedDatabase/Forms/PasswordChangeDlg.cs b/SharedDatabase/Forms/PasswordChangeDlg.cs
index e7d586868..0c37e3d97 100644
--- a/SharedDatabase/Forms/PasswordChangeDlg.cs
+++ b/SharedDatabase/Forms/PasswordChangeDlg.cs
@@ -22,6 +22,8 @@ namespace SharedDatabase.Forms
         public PasswordChangeDlg()
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
         }
 
         /// <summary>
@@ -30,6 +32,9 @@ namespace SharedDatabase.Forms
         public PasswordChangeDlg(string predefinedUser)
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             userNameTextBox.Text = predefinedUser;
         }
 
diff --git a/SharedDatabase/Forms/PlainLoginDlg.cs b/SharedDatabase/Forms/PlainLoginDlg.cs
index d2b85840a..95b51d53b 100644
--- a/SharedDatabase/Forms/PlainLoginDlg.cs
+++ b/SharedDatabase/Forms/PlainLoginDlg.cs
@@ -46,6 +46,8 @@ namespace SharedDatabase.Forms
         {
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             oriBackColor = BackColor;
         }
 
diff --git a/SharedDatabase/Forms/TripleLoginDlg.cs b/SharedDatabase/Forms/TripleLoginDlg.cs
index 1388ab6cb..b353715f8 100644
--- a/SharedDatabase/Forms/TripleLoginDlg.cs
+++ b/SharedDatabase/Forms/TripleLoginDlg.cs
@@ -46,6 +46,8 @@ namespace SharedDatabase.Forms
         {
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             loginStatePictureBox1.Image = Properties.Resources.questionMark;
             loginStatePictureBox2.Image = Properties.Resources.questionMark;
             loginStatePictureBox3.Image = Properties.Resources.questionMark;
diff --git a/SharedDatabase/Forms/UserManagementDlg.cs b/SharedDatabase/Forms/UserManagementDlg.cs
index 9696eefcd..1c6faab83 100644
--- a/SharedDatabase/Forms/UserManagementDlg.cs
+++ b/SharedDatabase/Forms/UserManagementDlg.cs
@@ -35,6 +35,9 @@ namespace SharedDatabase.Forms
         public UserManagementDlg(NHibernate.ISession session, bool showLocalExtensions)
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             this.session = session;
             this.showExtensions = showLocalExtensions;
             if (showLocalExtensions) copyFromRemoteButton.Visible = true;
diff --git a/SharedDatabase/Properties/Resources.Designer.cs b/SharedDatabase/Properties/Resources.Designer.cs
index 0ce8a1242..5065603c9 100644
--- a/SharedDatabase/Properties/Resources.Designer.cs
+++ b/SharedDatabase/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace SharedDatabase.Properties {
     // 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.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -89,5 +89,15 @@ namespace SharedDatabase.Properties {
                 return ((System.Drawing.Bitmap)(obj));
             }
         }
+        
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
+        internal static System.Drawing.Icon TBF_icon {
+            get {
+                object obj = ResourceManager.GetObject("TBF_icon", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
     }
 }
diff --git a/SharedDatabase/Properties/Resources.resx b/SharedDatabase/Properties/Resources.resx
index b56df7c17..950da7a6a 100644
--- a/SharedDatabase/Properties/Resources.resx
+++ b/SharedDatabase/Properties/Resources.resx
@@ -127,4 +127,7 @@
   <data name="rejected" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Pictures\rejected.bmp;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="TBF_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TBF_icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/SharedDatabase/Resources/TBF_icon.ico b/SharedDatabase/Resources/TBF_icon.ico
new file mode 100644
index 000000000..bf67f539b
Binary files /dev/null and b/SharedDatabase/Resources/TBF_icon.ico differ
diff --git a/SharedDatabase/SharedDatabase.csproj b/SharedDatabase/SharedDatabase.csproj
index a343d0099..bdb461ffc 100644
--- a/SharedDatabase/SharedDatabase.csproj
+++ b/SharedDatabase/SharedDatabase.csproj
@@ -221,6 +221,9 @@
     <None Include="Pictures\questionMark.bmp" />
     <None Include="Pictures\rejected.bmp" />
   </ItemGroup>
+  <ItemGroup>
+    <None Include="Resources\TBF_icon.ico" />
+  </ItemGroup>
   <Import Project="$(MSBuildToolsPath)\Microsoft.CSharp.targets" />
   <!-- To modify your build process, add your task inside one of the targets below and uncomment it. 
        Other similar extension points exist, see Microsoft.Common.targets.
diff --git a/TBF/Properties/Resources.Designer.cs b/TBF/Properties/Resources.Designer.cs
index df446c6aa..72d3cf219 100644
--- a/TBF/Properties/Resources.Designer.cs
+++ b/TBF/Properties/Resources.Designer.cs
@@ -19,7 +19,7 @@ namespace TBF.Properties {
     // 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.
-    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "4.0.0.0")]
+    [global::System.CodeDom.Compiler.GeneratedCodeAttribute("System.Resources.Tools.StronglyTypedResourceBuilder", "17.0.0.0")]
     [global::System.Diagnostics.DebuggerNonUserCodeAttribute()]
     [global::System.Runtime.CompilerServices.CompilerGeneratedAttribute()]
     internal class Resources {
@@ -150,6 +150,16 @@ namespace TBF.Properties {
             }
         }
         
+        /// <summary>
+        ///   Looks up a localized resource of type System.Drawing.Icon similar to (Icon).
+        /// </summary>
+        internal static System.Drawing.Icon TBF_icon {
+            get {
+                object obj = ResourceManager.GetObject("TBF_icon", resourceCulture);
+                return ((System.Drawing.Icon)(obj));
+            }
+        }
+        
         /// <summary>
         ///   Looks up a localized resource of type System.Drawing.Bitmap.
         /// </summary>
diff --git a/TBF/Properties/Resources.resx b/TBF/Properties/Resources.resx
index 46064472d..fb09c4b9d 100644
--- a/TBF/Properties/Resources.resx
+++ b/TBF/Properties/Resources.resx
@@ -208,4 +208,7 @@
   <data name="TControl_XL_idle" type="System.Resources.ResXFileRef, System.Windows.Forms">
     <value>..\Rig\Modbus\TempControl\Pictures\TControl-XL-idle.png;System.Drawing.Bitmap, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
   </data>
+  <data name="TBF_icon" type="System.Resources.ResXFileRef, System.Windows.Forms">
+    <value>..\Resources\TBF_icon.ico;System.Drawing.Icon, System.Drawing, Version=4.0.0.0, Culture=neutral, PublicKeyToken=b03f5f7f11d50a3a</value>
+  </data>
 </root>
\ No newline at end of file
diff --git a/TBF/Resources/TBF_icon.ico b/TBF/Resources/TBF_icon.ico
new file mode 100644
index 000000000..bf67f539b
Binary files /dev/null and b/TBF/Resources/TBF_icon.ico differ
diff --git a/TBF/Rig/DataEntry/Combined/CycleBeginningForm.cs b/TBF/Rig/DataEntry/Combined/CycleBeginningForm.cs
index 5a0b7ba8e..142072da1 100644
--- a/TBF/Rig/DataEntry/Combined/CycleBeginningForm.cs
+++ b/TBF/Rig/DataEntry/Combined/CycleBeginningForm.cs
@@ -57,6 +57,9 @@ namespace TBF.Rig.DataEntry.Combined
         public CycleBeginningForm(int compoundWaterMetersCount, bool remarksEnabled)
 		{
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             ControlBox = false;
 
             TextBoxesCount = 3;
diff --git a/TBF/Rig/DataEntry/Combined/CycleEndForm.cs b/TBF/Rig/DataEntry/Combined/CycleEndForm.cs
index 149ee188f..365673f59 100644
--- a/TBF/Rig/DataEntry/Combined/CycleEndForm.cs
+++ b/TBF/Rig/DataEntry/Combined/CycleEndForm.cs
@@ -33,7 +33,10 @@ namespace TBF.Rig.DataEntry.Combined
         public CycleEndForm()
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			MainStateText = new string[TBF.Data.CompoundWMsCount];
 			AuxStateText = new string[TBF.Data.CompoundWMsCount];
diff --git a/TBF/Rig/DataEntry/Combined/TestStartEndForm.cs b/TBF/Rig/DataEntry/Combined/TestStartEndForm.cs
index 8c1e966d3..e88bfd95d 100644
--- a/TBF/Rig/DataEntry/Combined/TestStartEndForm.cs
+++ b/TBF/Rig/DataEntry/Combined/TestStartEndForm.cs
@@ -56,7 +56,10 @@ namespace TBF.Rig.DataEntry.Combined
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 3;
 
diff --git a/TBF/Rig/DataEntry/HeatMeters12/CycleBeginningForm.cs b/TBF/Rig/DataEntry/HeatMeters12/CycleBeginningForm.cs
index d8da25d85..cebb53364 100644
--- a/TBF/Rig/DataEntry/HeatMeters12/CycleBeginningForm.cs
+++ b/TBF/Rig/DataEntry/HeatMeters12/CycleBeginningForm.cs
@@ -49,7 +49,10 @@ namespace TBF.Rig.DataEntry.HeatMeters12
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 			
 			labels = new Label[] { label1,  label2,  label3,  label4,  label5,  label6,
 					               label7,  label8,  label9,  label10, label11, label12 };
diff --git a/TBF/Rig/DataEntry/HeatMeters12/CycleEndForm.cs b/TBF/Rig/DataEntry/HeatMeters12/CycleEndForm.cs
index aac3beeb3..53ebde7d8 100644
--- a/TBF/Rig/DataEntry/HeatMeters12/CycleEndForm.cs
+++ b/TBF/Rig/DataEntry/HeatMeters12/CycleEndForm.cs
@@ -29,7 +29,10 @@ namespace TBF.Rig.DataEntry.HeatMeters12
         public CycleEndForm(int waterMetersCount)
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			this.WaterMetersCount = waterMetersCount;
 			EndStateText = new string[WaterMetersCount];
diff --git a/TBF/Rig/DataEntry/HeatMeters12/TestStartEndForm.cs b/TBF/Rig/DataEntry/HeatMeters12/TestStartEndForm.cs
index f455c005f..8ca0f11a1 100644
--- a/TBF/Rig/DataEntry/HeatMeters12/TestStartEndForm.cs
+++ b/TBF/Rig/DataEntry/HeatMeters12/TestStartEndForm.cs
@@ -61,7 +61,10 @@ namespace TBF.Rig.DataEntry.HeatMeters12
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 12;
 
diff --git a/TBF/Rig/DataEntry/HeatMeters6/CycleBeginningForm.cs b/TBF/Rig/DataEntry/HeatMeters6/CycleBeginningForm.cs
index b61fa8377..6cfabf6ea 100644
--- a/TBF/Rig/DataEntry/HeatMeters6/CycleBeginningForm.cs
+++ b/TBF/Rig/DataEntry/HeatMeters6/CycleBeginningForm.cs
@@ -49,7 +49,10 @@ namespace TBF.Rig.DataEntry.HeatMeters6
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 			
 			labels = new Label[] { label1,  label2,  label3,  label4,  label5,  label6 };
 			comboBoxes = new ComboBox[] { comboBox1,  comboBox2,  comboBox3,  comboBox4,  comboBox5,  comboBox6 };
diff --git a/TBF/Rig/DataEntry/HeatMeters6/CycleEndForm.cs b/TBF/Rig/DataEntry/HeatMeters6/CycleEndForm.cs
index 783fec5fa..5a5fb88ac 100644
--- a/TBF/Rig/DataEntry/HeatMeters6/CycleEndForm.cs
+++ b/TBF/Rig/DataEntry/HeatMeters6/CycleEndForm.cs
@@ -29,7 +29,10 @@ namespace TBF.Rig.DataEntry.HeatMeters6
         public CycleEndForm(int waterMetersCount)
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			this.WaterMetersCount = waterMetersCount;
 			EndStateText = new string[WaterMetersCount];
diff --git a/TBF/Rig/DataEntry/HeatMeters6/TestStartEndForm.cs b/TBF/Rig/DataEntry/HeatMeters6/TestStartEndForm.cs
index 7f3a366e0..8e10dcb67 100644
--- a/TBF/Rig/DataEntry/HeatMeters6/TestStartEndForm.cs
+++ b/TBF/Rig/DataEntry/HeatMeters6/TestStartEndForm.cs
@@ -61,7 +61,10 @@ namespace TBF.Rig.DataEntry.HeatMeters6
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 6;
 
diff --git a/TBF/Rig/DataEntry/PoseidonCmd/CycleBeginningForm.cs b/TBF/Rig/DataEntry/PoseidonCmd/CycleBeginningForm.cs
index 60f8a6313..3d8f29b7e 100644
--- a/TBF/Rig/DataEntry/PoseidonCmd/CycleBeginningForm.cs
+++ b/TBF/Rig/DataEntry/PoseidonCmd/CycleBeginningForm.cs
@@ -40,7 +40,10 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
             preselectedOrder = null;
 
 			completed = false;
diff --git a/TBF/Rig/DataEntry/PoseidonCmd/TestStartEndForm.cs b/TBF/Rig/DataEntry/PoseidonCmd/TestStartEndForm.cs
index 5087090fc..835cb7537 100644
--- a/TBF/Rig/DataEntry/PoseidonCmd/TestStartEndForm.cs
+++ b/TBF/Rig/DataEntry/PoseidonCmd/TestStartEndForm.cs
@@ -51,7 +51,10 @@ namespace TBF.Rig.DataEntry.PoseidonCmd
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 48;
 
diff --git a/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs b/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs
index 5f6fb51b7..1682b0be2 100644
--- a/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs
+++ b/TBF/Rig/DataEntry/S620/FormForMechanicalMetersWithTracing.cs
@@ -133,6 +133,9 @@ namespace TBF.Rig.DataEntry.S620
 		public FormForMechanicalMetersWithTracing()
 		{
 			InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             ControlBox = false;
             oriBackColor = BackColor;
             ManageCheckGroupBox(batchesCheckBox, batchesGroupBox);
diff --git a/TBF/Rig/DataEntry/S620/TestStartEndForm.cs b/TBF/Rig/DataEntry/S620/TestStartEndForm.cs
index bde116dd1..e9002d7a2 100644
--- a/TBF/Rig/DataEntry/S620/TestStartEndForm.cs
+++ b/TBF/Rig/DataEntry/S620/TestStartEndForm.cs
@@ -54,7 +54,10 @@ namespace TBF.Rig.DataEntry.S620
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 48;
 
diff --git a/TBF/Rig/DataEntry/Single/CycleBeginningForm.cs b/TBF/Rig/DataEntry/Single/CycleBeginningForm.cs
index 575b9ed0a..cb7f88439 100644
--- a/TBF/Rig/DataEntry/Single/CycleBeginningForm.cs
+++ b/TBF/Rig/DataEntry/Single/CycleBeginningForm.cs
@@ -37,7 +37,10 @@ namespace TBF.Rig.DataEntry.Single
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = 24;
 			labels = new Label[]
diff --git a/TBF/Rig/DataEntry/Single/CycleEndForm.cs b/TBF/Rig/DataEntry/Single/CycleEndForm.cs
index ef7c80dfd..1730d5a7c 100644
--- a/TBF/Rig/DataEntry/Single/CycleEndForm.cs
+++ b/TBF/Rig/DataEntry/Single/CycleEndForm.cs
@@ -35,7 +35,10 @@ namespace TBF.Rig.DataEntry.Single
         public CycleEndForm()
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
             labels = new Label[]
 				{
diff --git a/TBF/Rig/DataEntry/Single/TestStartEndForm.cs b/TBF/Rig/DataEntry/Single/TestStartEndForm.cs
index 3bd6e870e..a33107a44 100644
--- a/TBF/Rig/DataEntry/Single/TestStartEndForm.cs
+++ b/TBF/Rig/DataEntry/Single/TestStartEndForm.cs
@@ -58,7 +58,10 @@ namespace TBF.Rig.DataEntry.Single
 		public TestStartEndForm(int waterMetersCount, int lineSize)
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
             WaterMetersCount = waterMetersCount;
 
diff --git a/TBF/Rig/DataEntry/Standard12/CycleBeginningForm.cs b/TBF/Rig/DataEntry/Standard12/CycleBeginningForm.cs
index 6c03edff2..158c3d918 100644
--- a/TBF/Rig/DataEntry/Standard12/CycleBeginningForm.cs
+++ b/TBF/Rig/DataEntry/Standard12/CycleBeginningForm.cs
@@ -50,7 +50,10 @@ namespace TBF.Rig.DataEntry.Standard12
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 			
 			labels = new Label[] { label1,  label2,  label3,  label4,  label5,  label6,
 					               label7,  label8,  label9,  label10, label11, label12 };
diff --git a/TBF/Rig/DataEntry/Standard12/CycleEndForm.cs b/TBF/Rig/DataEntry/Standard12/CycleEndForm.cs
index 3580a9002..a0b57994f 100644
--- a/TBF/Rig/DataEntry/Standard12/CycleEndForm.cs
+++ b/TBF/Rig/DataEntry/Standard12/CycleEndForm.cs
@@ -34,7 +34,10 @@ namespace TBF.Rig.DataEntry.Standard12
         public CycleEndForm()
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
             labels = new Label[]
 				{
diff --git a/TBF/Rig/DataEntry/Standard12/TestStartEndForm.cs b/TBF/Rig/DataEntry/Standard12/TestStartEndForm.cs
index a36f6c209..45fc03118 100644
--- a/TBF/Rig/DataEntry/Standard12/TestStartEndForm.cs
+++ b/TBF/Rig/DataEntry/Standard12/TestStartEndForm.cs
@@ -51,7 +51,10 @@ namespace TBF.Rig.DataEntry.Standard12
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 12;
 
diff --git a/TBF/Rig/DataEntry/Standard24/AdvancedFixedStartTestForm.cs b/TBF/Rig/DataEntry/Standard24/AdvancedFixedStartTestForm.cs
index ebe966ee4..cff8f3d5c 100644
--- a/TBF/Rig/DataEntry/Standard24/AdvancedFixedStartTestForm.cs
+++ b/TBF/Rig/DataEntry/Standard24/AdvancedFixedStartTestForm.cs
@@ -51,7 +51,10 @@ namespace TBF.Rig.DataEntry.Standard24
 		public AdvancedFixedStartTestForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 24;
 
diff --git a/TBF/Rig/DataEntry/Standard24/CycleBeginningForm.cs b/TBF/Rig/DataEntry/Standard24/CycleBeginningForm.cs
index f9a4296f5..6eb541afd 100644
--- a/TBF/Rig/DataEntry/Standard24/CycleBeginningForm.cs
+++ b/TBF/Rig/DataEntry/Standard24/CycleBeginningForm.cs
@@ -37,7 +37,10 @@ namespace TBF.Rig.DataEntry.Standard24
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = 24;
 			labels = new Label[]
diff --git a/TBF/Rig/DataEntry/Standard24/CycleEndForm.cs b/TBF/Rig/DataEntry/Standard24/CycleEndForm.cs
index bcbc84fb1..722589ca7 100644
--- a/TBF/Rig/DataEntry/Standard24/CycleEndForm.cs
+++ b/TBF/Rig/DataEntry/Standard24/CycleEndForm.cs
@@ -35,7 +35,10 @@ namespace TBF.Rig.DataEntry.Standard24
         public CycleEndForm()
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
             labels = new Label[]
 				{
diff --git a/TBF/Rig/DataEntry/Standard24/TestStartEndForm.cs b/TBF/Rig/DataEntry/Standard24/TestStartEndForm.cs
index 0c6a8fe65..8a02828c5 100644
--- a/TBF/Rig/DataEntry/Standard24/TestStartEndForm.cs
+++ b/TBF/Rig/DataEntry/Standard24/TestStartEndForm.cs
@@ -64,7 +64,10 @@ namespace TBF.Rig.DataEntry.Standard24
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 24;
 
diff --git a/TBF/Rig/DataEntry/Standard48/CycleBeginningForm.cs b/TBF/Rig/DataEntry/Standard48/CycleBeginningForm.cs
index 9fa38d154..f23047204 100644
--- a/TBF/Rig/DataEntry/Standard48/CycleBeginningForm.cs
+++ b/TBF/Rig/DataEntry/Standard48/CycleBeginningForm.cs
@@ -37,7 +37,10 @@ namespace TBF.Rig.DataEntry.Standard48
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = 48;
 			labels = new Label[]
diff --git a/TBF/Rig/DataEntry/Standard48/CycleEndForm.cs b/TBF/Rig/DataEntry/Standard48/CycleEndForm.cs
index b58046283..43e748d61 100644
--- a/TBF/Rig/DataEntry/Standard48/CycleEndForm.cs
+++ b/TBF/Rig/DataEntry/Standard48/CycleEndForm.cs
@@ -29,7 +29,10 @@ namespace TBF.Rig.DataEntry.Standard48
         public CycleEndForm(int waterMetersCount)
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			this.WaterMetersCount = waterMetersCount;
 			EndStateText = new string[WaterMetersCount];
diff --git a/TBF/Rig/DataEntry/Standard48/TestStartEndForm.cs b/TBF/Rig/DataEntry/Standard48/TestStartEndForm.cs
index bef55a1df..6d342035b 100644
--- a/TBF/Rig/DataEntry/Standard48/TestStartEndForm.cs
+++ b/TBF/Rig/DataEntry/Standard48/TestStartEndForm.cs
@@ -54,7 +54,10 @@ namespace TBF.Rig.DataEntry.Standard48
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 48;
 
diff --git a/TBF/Rig/DataEntry/Standard6/CycleBeginningForm.cs b/TBF/Rig/DataEntry/Standard6/CycleBeginningForm.cs
index 9f424e8d7..36a818b7d 100644
--- a/TBF/Rig/DataEntry/Standard6/CycleBeginningForm.cs
+++ b/TBF/Rig/DataEntry/Standard6/CycleBeginningForm.cs
@@ -40,7 +40,10 @@ namespace TBF.Rig.DataEntry.Standard6
         public CycleBeginningForm(int waterMetersCount, bool remarksEnabled)
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
             comboBoxes = new ComboBox[] { comboBox1, comboBox2, comboBox3, comboBox4, comboBox5, comboBox6 };
             checkBoxes = new CheckBox[] { checkBox1, checkBox2, checkBox3, checkBox4, checkBox5, checkBox6 };
diff --git a/TBF/Rig/DataEntry/Standard6/CycleEndForm.cs b/TBF/Rig/DataEntry/Standard6/CycleEndForm.cs
index 9b3b47eb9..77ca23c45 100644
--- a/TBF/Rig/DataEntry/Standard6/CycleEndForm.cs
+++ b/TBF/Rig/DataEntry/Standard6/CycleEndForm.cs
@@ -38,7 +38,10 @@ namespace TBF.Rig.DataEntry.Standard6
         public CycleEndForm()
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
             labels = new Label[] { label1,  label2,  label3,  label4,  label5,  label6 };
             stateBoxes = new TextBox[] { textBox1,  textBox2,  textBox3,  textBox4,  textBox5,  textBox6 };
diff --git a/TBF/Rig/DataEntry/Standard6/TestStartEndForm.cs b/TBF/Rig/DataEntry/Standard6/TestStartEndForm.cs
index c30096579..94c223089 100644
--- a/TBF/Rig/DataEntry/Standard6/TestStartEndForm.cs
+++ b/TBF/Rig/DataEntry/Standard6/TestStartEndForm.cs
@@ -46,7 +46,10 @@ namespace TBF.Rig.DataEntry.Standard6
 		public TestStartEndForm(int waterMetersCount, IRegReader[] regReaders, bool[] disabled)
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			endStates = false;
 			this.WaterMetersCount = waterMetersCount;
diff --git a/TBF/Rig/DataEntry/StandardCamera/CycleBeginningForm.cs b/TBF/Rig/DataEntry/StandardCamera/CycleBeginningForm.cs
index 232adc5a7..807381e92 100644
--- a/TBF/Rig/DataEntry/StandardCamera/CycleBeginningForm.cs
+++ b/TBF/Rig/DataEntry/StandardCamera/CycleBeginningForm.cs
@@ -37,7 +37,10 @@ namespace TBF.Rig.DataEntry.StandardCamera
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = 24;
 			labels = new Label[]
diff --git a/TBF/Rig/DataEntry/StandardCamera/CycleEndForm.cs b/TBF/Rig/DataEntry/StandardCamera/CycleEndForm.cs
index 9ac429eb7..aeb2fcfbb 100644
--- a/TBF/Rig/DataEntry/StandardCamera/CycleEndForm.cs
+++ b/TBF/Rig/DataEntry/StandardCamera/CycleEndForm.cs
@@ -35,7 +35,10 @@ namespace TBF.Rig.DataEntry.StandardCamera
         public CycleEndForm()
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
             labels = new Label[]
 				{
diff --git a/TBF/Rig/DataEntry/StandardCamera/TestStartEndForm.cs b/TBF/Rig/DataEntry/StandardCamera/TestStartEndForm.cs
index be2220eb2..011dabbe1 100644
--- a/TBF/Rig/DataEntry/StandardCamera/TestStartEndForm.cs
+++ b/TBF/Rig/DataEntry/StandardCamera/TestStartEndForm.cs
@@ -96,7 +96,10 @@ namespace TBF.Rig.DataEntry.StandardCamera
         public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			labels = new Label[]
 				{
diff --git a/TBF/Rig/DataEntry/StandartCameraPurchaseOrder/CycleBeginningForm.cs b/TBF/Rig/DataEntry/StandartCameraPurchaseOrder/CycleBeginningForm.cs
index c623daa86..e0d49ac32 100644
--- a/TBF/Rig/DataEntry/StandartCameraPurchaseOrder/CycleBeginningForm.cs
+++ b/TBF/Rig/DataEntry/StandartCameraPurchaseOrder/CycleBeginningForm.cs
@@ -57,6 +57,9 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
         public CycleBeginningForm()
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             ControlBox = false;
 
             textBoxesCount = 48;
diff --git a/TBF/Rig/DataEntry/StandartCameraPurchaseOrder/CycleEndForm.cs b/TBF/Rig/DataEntry/StandartCameraPurchaseOrder/CycleEndForm.cs
index f088f8f18..e4c5998e6 100644
--- a/TBF/Rig/DataEntry/StandartCameraPurchaseOrder/CycleEndForm.cs
+++ b/TBF/Rig/DataEntry/StandartCameraPurchaseOrder/CycleEndForm.cs
@@ -35,7 +35,10 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
         public CycleEndForm()
         {
             InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
             labels = new Label[]
 				{
diff --git a/TBF/Rig/DataEntry/StandartCameraPurchaseOrder/TestStartEndForm.cs b/TBF/Rig/DataEntry/StandartCameraPurchaseOrder/TestStartEndForm.cs
index 4e2472d0c..8d222e048 100644
--- a/TBF/Rig/DataEntry/StandartCameraPurchaseOrder/TestStartEndForm.cs
+++ b/TBF/Rig/DataEntry/StandartCameraPurchaseOrder/TestStartEndForm.cs
@@ -96,7 +96,10 @@ namespace TBF.Rig.DataEntry.StandartCameraPurchaseOrder
         public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			labels = new Label[]
 				{
diff --git a/TBF/Rig/DataEntry/Uni/CycleBgEnForm.cs b/TBF/Rig/DataEntry/Uni/CycleBgEnForm.cs
index 9939550c1..3fb74061a 100644
--- a/TBF/Rig/DataEntry/Uni/CycleBgEnForm.cs
+++ b/TBF/Rig/DataEntry/Uni/CycleBgEnForm.cs
@@ -68,7 +68,10 @@ namespace TBF.Rig.DataEntry.Uni
 		public CycleBgEnForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 			completed = false;
 			StartForceCloseHandler();
 		}
diff --git a/TBF/Rig/DataEntry/Uni/TestStartEndForm.cs b/TBF/Rig/DataEntry/Uni/TestStartEndForm.cs
index 2b5b1635e..e6a963db0 100644
--- a/TBF/Rig/DataEntry/Uni/TestStartEndForm.cs
+++ b/TBF/Rig/DataEntry/Uni/TestStartEndForm.cs
@@ -121,7 +121,10 @@ namespace TBF.Rig.DataEntry.Uni
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
             imageProcessingThread = null;
             completed = false;
 			StartForceCloseHandler();
diff --git a/TBF/Rig/DataEntry/iPerl/CycleBeginningForm.cs b/TBF/Rig/DataEntry/iPerl/CycleBeginningForm.cs
index 2c9e579b7..5ed22db3b 100644
--- a/TBF/Rig/DataEntry/iPerl/CycleBeginningForm.cs
+++ b/TBF/Rig/DataEntry/iPerl/CycleBeginningForm.cs
@@ -39,7 +39,10 @@ namespace TBF.Rig.DataEntry.iPerl
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			completed = false;
 			StartForceCloseHandler();
diff --git a/TBF/Rig/DataEntry/iPerl/TestStartEndForm.cs b/TBF/Rig/DataEntry/iPerl/TestStartEndForm.cs
index e4fabb2e7..385ee420b 100644
--- a/TBF/Rig/DataEntry/iPerl/TestStartEndForm.cs
+++ b/TBF/Rig/DataEntry/iPerl/TestStartEndForm.cs
@@ -50,7 +50,10 @@ namespace TBF.Rig.DataEntry.iPerl
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 48;
 
diff --git a/TBF/Rig/Modbus/QuidoRS/ConfirmationForm.cs b/TBF/Rig/Modbus/QuidoRS/ConfirmationForm.cs
index b079662cb..109ac3f14 100644
--- a/TBF/Rig/Modbus/QuidoRS/ConfirmationForm.cs
+++ b/TBF/Rig/Modbus/QuidoRS/ConfirmationForm.cs
@@ -22,7 +22,10 @@ namespace TBF.Rig.Modbus.QuidoRS
 		{
 			InitializeComponent();
 
-			Localize();
+            this.Icon = Properties.Resources.TBF_icon;
+
+
+            Localize();
 			messageLabel.Text = message;
             BackColor = backgroundColor;
 
diff --git a/TBF/Rig/Network/Camera/CJMS11/TerminalDlg.cs b/TBF/Rig/Network/Camera/CJMS11/TerminalDlg.cs
index ee4789a0e..4c64af0a8 100644
--- a/TBF/Rig/Network/Camera/CJMS11/TerminalDlg.cs
+++ b/TBF/Rig/Network/Camera/CJMS11/TerminalDlg.cs
@@ -11,12 +11,18 @@ namespace TBF.Rig.Network.Camera.CJMS11
 		public TerminalDlg()
 		{
 			InitializeComponent();
-		}
 
-		public TerminalDlg(string name, TelnetClient telnet)
+            this.Icon = Properties.Resources.TBF_icon;
+
+        }
+
+        public TerminalDlg(string name, TelnetClient telnet)
 		{
 			InitializeComponent();
-			Text = name;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            Text = name;
 			this.telnet = telnet;
 		}
 
diff --git a/TBF/Rig/Network/Camera/CLP1611/TerminalDlg.cs b/TBF/Rig/Network/Camera/CLP1611/TerminalDlg.cs
index a50c58c8f..c9137e706 100644
--- a/TBF/Rig/Network/Camera/CLP1611/TerminalDlg.cs
+++ b/TBF/Rig/Network/Camera/CLP1611/TerminalDlg.cs
@@ -11,12 +11,18 @@ namespace TBF.Rig.Network.Camera.CLP1611
 		public TerminalDlg()
 		{
 			InitializeComponent();
-		}
 
-		public TerminalDlg(string name, TelnetClient telnet)
+            this.Icon = Properties.Resources.TBF_icon;
+
+        }
+
+        public TerminalDlg(string name, TelnetClient telnet)
 		{
 			InitializeComponent();
-			Text = name;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            Text = name;
 			this.telnet = telnet;
 		}
 
diff --git a/TBF/Rig/Network/Camera/Display/DisplayForm.cs b/TBF/Rig/Network/Camera/Display/DisplayForm.cs
index 78134a99a..1fbe4302d 100644
--- a/TBF/Rig/Network/Camera/Display/DisplayForm.cs
+++ b/TBF/Rig/Network/Camera/Display/DisplayForm.cs
@@ -73,7 +73,10 @@ namespace TBF.Rig.Network.Camera.Display
         {
 			InitializeComponent();
 
-			this.imageFileNames = imageFileNames;
+            this.Icon = Properties.Resources.TBF_icon;
+
+
+            this.imageFileNames = imageFileNames;
 			this.imagesCount = (imageFileNames == null) ? 0 : imageFileNames.Length;
 
             groupBoxes = new GroupBox[] { groupBox1, groupBox2, groupBox3, groupBox4, groupBox5, groupBox6,
diff --git a/TBF/Rig/Operations/AskYesNoForm.cs b/TBF/Rig/Operations/AskYesNoForm.cs
index 51ecef7ad..1b5eb4ad8 100644
--- a/TBF/Rig/Operations/AskYesNoForm.cs
+++ b/TBF/Rig/Operations/AskYesNoForm.cs
@@ -21,6 +21,9 @@ namespace TBF.Rig.Operations
 		public AskYesNoForm(string question)
 		{
 			InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             ControlBox = false;
 
 			Localize();
diff --git a/TBF/Rig/Operations/LargeMessageBoxForm.cs b/TBF/Rig/Operations/LargeMessageBoxForm.cs
index 6866579c2..38cfe8e25 100644
--- a/TBF/Rig/Operations/LargeMessageBoxForm.cs
+++ b/TBF/Rig/Operations/LargeMessageBoxForm.cs
@@ -21,9 +21,12 @@ namespace TBF.Rig.Operations
 		public LargeMessageBoxForm(string message, Color backgroundColor)
 		{
 			InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             //ControlBox = false;
 
-			Localize();
+            Localize();
 			messageLabel.Text = message;
             BackColor = backgroundColor;
 
diff --git a/TBF/Rig/Operations/MessageBoxForm.cs b/TBF/Rig/Operations/MessageBoxForm.cs
index 528fdf451..61872f1f5 100644
--- a/TBF/Rig/Operations/MessageBoxForm.cs
+++ b/TBF/Rig/Operations/MessageBoxForm.cs
@@ -21,9 +21,12 @@ namespace TBF.Rig.Operations
 		public MessageBoxForm(string message, Color backgroundColor)
 		{
 			InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             //ControlBox = false;
 
-			Localize();
+            Localize();
 			messageLabel.Text = message;
             BackColor = backgroundColor;
 
diff --git a/TBF/Rig/Output/HeaderFooterDlg.cs b/TBF/Rig/Output/HeaderFooterDlg.cs
index 025a78d07..0af4716c3 100644
--- a/TBF/Rig/Output/HeaderFooterDlg.cs
+++ b/TBF/Rig/Output/HeaderFooterDlg.cs
@@ -17,6 +17,9 @@ namespace TBF.Rig.Output
         public HeaderFooterDlg()
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
         }
 
         public HeaderFooterDlg(bool isHeader, string text)
diff --git a/TBF/Rig/Output/Printers/GroupPrinting/Single/PrinterTestBenchComponentSelectorDlg.cs b/TBF/Rig/Output/Printers/GroupPrinting/Single/PrinterTestBenchComponentSelectorDlg.cs
index fb793d3e1..259f72cf0 100644
--- a/TBF/Rig/Output/Printers/GroupPrinting/Single/PrinterTestBenchComponentSelectorDlg.cs
+++ b/TBF/Rig/Output/Printers/GroupPrinting/Single/PrinterTestBenchComponentSelectorDlg.cs
@@ -30,8 +30,11 @@ namespace TBF.Rig.Output.Printers.GroupPrinting.Single
         public PrinterTestBenchComponentSelectorDlg()
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
         }
-        
+
         private void LoadFormPosition()
         {
             LocalSettings ls = Program.LocalSettings;
diff --git a/TBF/Rig/RegisterReaders/KPackE/DataEntryForRadio/CycleBeginningForm.cs b/TBF/Rig/RegisterReaders/KPackE/DataEntryForRadio/CycleBeginningForm.cs
index 398abc763..c4ca94e53 100644
--- a/TBF/Rig/RegisterReaders/KPackE/DataEntryForRadio/CycleBeginningForm.cs
+++ b/TBF/Rig/RegisterReaders/KPackE/DataEntryForRadio/CycleBeginningForm.cs
@@ -37,7 +37,10 @@ namespace TBF.Rig.RegisterReaders.KPackE.DataEntryForRadio
 		public CycleBeginningForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = 48;
 			labels = new Label[]
diff --git a/TBF/Rig/RegisterReaders/KPackE/DataEntryForRadio/TestStartEndForm.cs b/TBF/Rig/RegisterReaders/KPackE/DataEntryForRadio/TestStartEndForm.cs
index 4a3e0213b..48a67d6cb 100644
--- a/TBF/Rig/RegisterReaders/KPackE/DataEntryForRadio/TestStartEndForm.cs
+++ b/TBF/Rig/RegisterReaders/KPackE/DataEntryForRadio/TestStartEndForm.cs
@@ -55,7 +55,10 @@ namespace TBF.Rig.RegisterReaders.KPackE.DataEntryForRadio
 		public TestStartEndForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			TextBoxesCount = 48;
 
diff --git a/TBF/Rig/TestMethods/Adjustment/WMErrorsForm.cs b/TBF/Rig/TestMethods/Adjustment/WMErrorsForm.cs
index a40131f90..99d71955d 100644
--- a/TBF/Rig/TestMethods/Adjustment/WMErrorsForm.cs
+++ b/TBF/Rig/TestMethods/Adjustment/WMErrorsForm.cs
@@ -63,7 +63,10 @@ namespace TBF.Rig.TestMethods.Adjustment
         public WMErrorsForm()
         {
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			completed = false;
 
diff --git a/TBF/Rig/TestMethods/Adjustment/WMErrorsForm12.cs b/TBF/Rig/TestMethods/Adjustment/WMErrorsForm12.cs
index 92b788d43..7471a7c2f 100644
--- a/TBF/Rig/TestMethods/Adjustment/WMErrorsForm12.cs
+++ b/TBF/Rig/TestMethods/Adjustment/WMErrorsForm12.cs
@@ -46,7 +46,10 @@ namespace TBF.Rig.TestMethods.Adjustment
 		public WMErrorsForm12()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = MaxWMsCount;
 
diff --git a/TBF/Rig/TestMethods/Adjustment/WMErrorsForm24.cs b/TBF/Rig/TestMethods/Adjustment/WMErrorsForm24.cs
index 71a62744d..6e483b769 100644
--- a/TBF/Rig/TestMethods/Adjustment/WMErrorsForm24.cs
+++ b/TBF/Rig/TestMethods/Adjustment/WMErrorsForm24.cs
@@ -45,7 +45,10 @@ namespace TBF.Rig.TestMethods.Adjustment
 		public WMErrorsForm24()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = MaxWMsCount;
 
diff --git a/TBF/Rig/TestMethods/Adjustment/WMErrorsForm48.cs b/TBF/Rig/TestMethods/Adjustment/WMErrorsForm48.cs
index 116378c2f..79fba3f92 100644
--- a/TBF/Rig/TestMethods/Adjustment/WMErrorsForm48.cs
+++ b/TBF/Rig/TestMethods/Adjustment/WMErrorsForm48.cs
@@ -45,7 +45,10 @@ namespace TBF.Rig.TestMethods.Adjustment
 		public WMErrorsForm48()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = MaxWMsCount;
 
diff --git a/TBF/Rig/TestMethods/Endurance/CycleDlg.cs b/TBF/Rig/TestMethods/Endurance/CycleDlg.cs
index 880b9c1db..fdb4c9f35 100644
--- a/TBF/Rig/TestMethods/Endurance/CycleDlg.cs
+++ b/TBF/Rig/TestMethods/Endurance/CycleDlg.cs
@@ -47,7 +47,10 @@ namespace TBF.Rig.TestMethods.Endurance
 
 			InitializeComponent();
 
-			/// SharedDlgButtons configuration
+            this.Icon = Properties.Resources.TBF_icon;
+
+
+            /// SharedDlgButtons configuration
             sharedButtons.ParentForm = this;
 			sharedButtons.RequiredGroupMembership = new Common.GID[] { Common.GID.Metrologists };
 			sharedButtons.OptionalButtons = SharedButtons.Buttons.Add |
diff --git a/TBF/Rig/TestMethods/ManualEntry/ManualEntryForm.cs b/TBF/Rig/TestMethods/ManualEntry/ManualEntryForm.cs
index 56a48eb5b..ab7af6c4c 100644
--- a/TBF/Rig/TestMethods/ManualEntry/ManualEntryForm.cs
+++ b/TBF/Rig/TestMethods/ManualEntry/ManualEntryForm.cs
@@ -41,6 +41,9 @@ namespace TBF.Rig.TestMethods.ManualEntry
         {
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
+
             groupBoxes = new GroupBox[] { groupBox1, groupBox2, groupBox3, groupBox4, groupBox5, groupBox6, groupBox7 };
             labels = new Label[] { label1, label2, label3, label4, label5, label6, label7 };
             textBoxes = new TextBox[] { textBox1, textBox2, textBox3, textBox4, textBox5, textBox6, textBox7 };
diff --git a/TBF/Rig/TestMethods/PulsesTest/WMPulsesForm.cs b/TBF/Rig/TestMethods/PulsesTest/WMPulsesForm.cs
index b2252655e..835145fb2 100644
--- a/TBF/Rig/TestMethods/PulsesTest/WMPulsesForm.cs
+++ b/TBF/Rig/TestMethods/PulsesTest/WMPulsesForm.cs
@@ -57,7 +57,10 @@ namespace TBF.Rig.TestMethods.PulsesTest
         public WMPulsesForm()
         {
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			completed = false;
             minPulsesCount = 1;            /// Must be >0 so that initially the indication is RED
diff --git a/TBF/Rig/TestMethods/PulsesTest/WMPulsesForm12.cs b/TBF/Rig/TestMethods/PulsesTest/WMPulsesForm12.cs
index f9f024bcf..c58063613 100644
--- a/TBF/Rig/TestMethods/PulsesTest/WMPulsesForm12.cs
+++ b/TBF/Rig/TestMethods/PulsesTest/WMPulsesForm12.cs
@@ -44,7 +44,10 @@ namespace TBF.Rig.TestMethods.PulsesTest
 		public WMPulsesForm12()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = MaxWMsCount;
 
diff --git a/TBF/Rig/TestMethods/PulsesTest/WMPulsesForm24.cs b/TBF/Rig/TestMethods/PulsesTest/WMPulsesForm24.cs
index 83f1f9343..ed4c10a67 100644
--- a/TBF/Rig/TestMethods/PulsesTest/WMPulsesForm24.cs
+++ b/TBF/Rig/TestMethods/PulsesTest/WMPulsesForm24.cs
@@ -44,7 +44,10 @@ namespace TBF.Rig.TestMethods.PulsesTest
 		public WMPulsesForm24()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = MaxWMsCount;
 
diff --git a/TBF/Rig/TestMethods/PulsesTestManual/ManualPulsesForm.cs b/TBF/Rig/TestMethods/PulsesTestManual/ManualPulsesForm.cs
index aa62459ef..1b0558880 100644
--- a/TBF/Rig/TestMethods/PulsesTestManual/ManualPulsesForm.cs
+++ b/TBF/Rig/TestMethods/PulsesTestManual/ManualPulsesForm.cs
@@ -56,7 +56,10 @@ namespace TBF.Rig.TestMethods.PulsesTestManual
         public ManualPulsesForm()
         {
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			completed = false;
 
diff --git a/TBF/Rig/TestMethods/PulsesTestManual/ManualPulsesForm12.cs b/TBF/Rig/TestMethods/PulsesTestManual/ManualPulsesForm12.cs
index c5a4f318d..34e763f9b 100644
--- a/TBF/Rig/TestMethods/PulsesTestManual/ManualPulsesForm12.cs
+++ b/TBF/Rig/TestMethods/PulsesTestManual/ManualPulsesForm12.cs
@@ -49,7 +49,10 @@ namespace TBF.Rig.TestMethods.PulsesTestManual
 		public ManualPulsesForm12()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = MaxWMsCount;
 
diff --git a/TBF/Rig/TestMethods/PulsesTestManual/ManualPulsesForm24.cs b/TBF/Rig/TestMethods/PulsesTestManual/ManualPulsesForm24.cs
index 7b1938ba3..67b4b4869 100644
--- a/TBF/Rig/TestMethods/PulsesTestManual/ManualPulsesForm24.cs
+++ b/TBF/Rig/TestMethods/PulsesTestManual/ManualPulsesForm24.cs
@@ -50,7 +50,10 @@ namespace TBF.Rig.TestMethods.PulsesTestManual
 		public ManualPulsesForm24()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 
 			textBoxesCount = MaxWMsCount;
 
diff --git a/TBF/Rig/TestMethods/S640Communication/S640CommForm.cs b/TBF/Rig/TestMethods/S640Communication/S640CommForm.cs
index 231c84057..5d17422f6 100644
--- a/TBF/Rig/TestMethods/S640Communication/S640CommForm.cs
+++ b/TBF/Rig/TestMethods/S640Communication/S640CommForm.cs
@@ -144,6 +144,8 @@ namespace TBF.Rig.TestMethods.S640Communication
 		{
 			InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             labels = new Label[UIBoxesCount]
 			{
 				wmLabel1,  wmLabel2,  wmLabel3,  wmLabel4,  wmLabel5,  wmLabel6,  wmLabel7,
diff --git a/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationFormTestMethod.cs b/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationFormTestMethod.cs
index eafbe00a8..c1d2f592e 100644
--- a/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationFormTestMethod.cs
+++ b/TBF/Rig/TestMethods/iPerlCommunication/iPerlCommunicationFormTestMethod.cs
@@ -211,6 +211,9 @@ namespace TBF.Rig.TestMethods.iPerlCommunication
 		public iPerlCommunicationFormTestMethod()
 		{
 			InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
         }
 
         /// <summary>
diff --git a/TBF/Rig/Uni/SharedDialogs/SmartMetersCommunication/SmartCommunicationForm.cs b/TBF/Rig/Uni/SharedDialogs/SmartMetersCommunication/SmartCommunicationForm.cs
index 3c2147c35..a4f41c33a 100644
--- a/TBF/Rig/Uni/SharedDialogs/SmartMetersCommunication/SmartCommunicationForm.cs
+++ b/TBF/Rig/Uni/SharedDialogs/SmartMetersCommunication/SmartCommunicationForm.cs
@@ -277,6 +277,8 @@ namespace TBF.Rig.Uni.SharedDialogs.SmartMetersCommunication
 		public SmartCommunicationForm()
 		{
 			InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
         }
 
         /// <summary>
diff --git a/TBF/Rig/Various/CoverTest/CoverTestForm.cs b/TBF/Rig/Various/CoverTest/CoverTestForm.cs
index 95e3f25e2..9528c51f8 100644
--- a/TBF/Rig/Various/CoverTest/CoverTestForm.cs
+++ b/TBF/Rig/Various/CoverTest/CoverTestForm.cs
@@ -24,6 +24,9 @@ namespace TBF.Rig.Various.CoverTest
         public CoverTestForm(string message, GID[] bypassLevel, ILog bypassLog)
 		{
 			InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             ControlBox = false;
 
             this.message = message;
diff --git a/TBF/Rig/Various/ManualLevelMsrmnt/WaterLevelForm.cs b/TBF/Rig/Various/ManualLevelMsrmnt/WaterLevelForm.cs
index e2771eab4..eed1fdee6 100644
--- a/TBF/Rig/Various/ManualLevelMsrmnt/WaterLevelForm.cs
+++ b/TBF/Rig/Various/ManualLevelMsrmnt/WaterLevelForm.cs
@@ -27,7 +27,10 @@ namespace TBF.Rig.Various.ManualLevelMsrmnt
 		public WaterLevelForm()
 		{
 			InitializeComponent();
-			ControlBox = false;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            ControlBox = false;
 			Level_mm = 0;
 			completed = false;
 			StartForceCloseHandler();
diff --git a/TBF/TBF.csproj b/TBF/TBF.csproj
index 062ee596a..d2135ea06 100644
--- a/TBF/TBF.csproj
+++ b/TBF/TBF.csproj
@@ -101,6 +101,9 @@
   <PropertyGroup>
     <SignManifests>false</SignManifests>
   </PropertyGroup>
+  <PropertyGroup>
+    <ApplicationIcon>TBF_icon.ico</ApplicationIcon>
+  </PropertyGroup>
   <ItemGroup>
     <Reference Include="Castle.Core, Version=5.0.0.0, Culture=neutral, PublicKeyToken=407dd0808d44fbdc, processorArchitecture=MSIL">
       <HintPath>..\packages\Castle.Core.5.1.1\lib\net462\Castle.Core.dll</HintPath>
@@ -1456,7 +1459,9 @@
     <Compile Include="Rig\Scales\MettlerToledo\Factory.cs" />
     <Compile Include="Rig\Scales\MettlerToledo\GetSerNumOp.cs" />
     <Compile Include="Rig\Scales\MettlerToledo\ReadStableMassOp.cs" />
-    <Compile Include="Rig\Scales\MettlerToledo\SerialPortDevice.cs" />
+    <Compile Include="Rig\Scales\MettlerToledo\SerialPortDevice.cs">
+      <SubType>Component</SubType>
+    </Compile>
     <Compile Include="Rig\Scales\MettlerToledo\SerialPortDeviceFake.cs" />
     <Compile Include="Rig\Scales\MettlerToledo\SetUnitsOp.cs" />
     <Compile Include="Rig\Scales\MettlerToledo\TaringOp.cs" />
@@ -3978,6 +3983,7 @@
     <None Include="Resources\qrcode-48x48.png" />
     <Content Include="Resources\switch-off.png" />
     <Content Include="Resources\switch-on.png" />
+    <None Include="Resources\TBF_icon.ico" />
     <Content Include="Rig\Modbus\TempControl\Pictures\TControl-L-both.png" />
     <Content Include="Rig\Modbus\TempControl\Pictures\TControl-L-cooling.png" />
     <Content Include="Rig\Modbus\TempControl\Pictures\TControl-L-heating.png" />
@@ -4000,6 +4006,7 @@
     <Content Include="SampleConfig\log4netConfig.xml">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
+    <Content Include="TBF_icon.ico" />
     <Content Include="x64\SQLite.Interop.dll">
       <CopyToOutputDirectory>Always</CopyToOutputDirectory>
     </Content>
diff --git a/TBF/TBF_icon.ico b/TBF/TBF_icon.ico
new file mode 100644
index 000000000..bf67f539b
Binary files /dev/null and b/TBF/TBF_icon.ico differ
diff --git a/TBF/UI/Bench/Components/ComponentParametersDlg.cs b/TBF/UI/Bench/Components/ComponentParametersDlg.cs
index 3a4ec2856..e41db2935 100644
--- a/TBF/UI/Bench/Components/ComponentParametersDlg.cs
+++ b/TBF/UI/Bench/Components/ComponentParametersDlg.cs
@@ -40,6 +40,9 @@ namespace TBF.UI.Bench.Components
         ComponentParametersDlg()
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
         }
 
         /// <summary>
diff --git a/TBF/UI/Bench/Components/ComponentsManagerDlg.cs b/TBF/UI/Bench/Components/ComponentsManagerDlg.cs
index 9df9e5690..9f8bf0a2e 100644
--- a/TBF/UI/Bench/Components/ComponentsManagerDlg.cs
+++ b/TBF/UI/Bench/Components/ComponentsManagerDlg.cs
@@ -72,6 +72,8 @@ namespace TBF.UI.Bench.Components
 
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             flags = CfgUpdateFlags.None;
 
             selectComponentTypeDlg = new SelectComponentClassDlg();
diff --git a/TBF/UI/Bench/Components/SelectComponentClassDlg.cs b/TBF/UI/Bench/Components/SelectComponentClassDlg.cs
index 7c5d42552..80cebf4d1 100644
--- a/TBF/UI/Bench/Components/SelectComponentClassDlg.cs
+++ b/TBF/UI/Bench/Components/SelectComponentClassDlg.cs
@@ -22,6 +22,8 @@ namespace TBF.UI.Bench.Components
 		{
 			InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             classNamePrefix = (prefix != null) ? prefix : string.Empty;
 			foreach (var componentFactory in Rig.TbfComponents.Factories)
 			{
diff --git a/TBF/UI/Bench/EditSchDrawing/EditSchDrawingDlg.cs b/TBF/UI/Bench/EditSchDrawing/EditSchDrawingDlg.cs
index e31fc4a10..6aac517f0 100644
--- a/TBF/UI/Bench/EditSchDrawing/EditSchDrawingDlg.cs
+++ b/TBF/UI/Bench/EditSchDrawing/EditSchDrawingDlg.cs
@@ -47,6 +47,9 @@ namespace TBF.UI.Bench.EditSchDrawing
         public EditSchDrawingDlg()
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             Controls.Add(new TextBox() { Visible = false });
             selectComponentTypeDlg = new SelectComponentClassDlg("Various.Drawing.");
 
diff --git a/TBF/UI/Bench/Metrology/MetrologyDlg.cs b/TBF/UI/Bench/Metrology/MetrologyDlg.cs
index c3af033a0..15d2332d1 100644
--- a/TBF/UI/Bench/Metrology/MetrologyDlg.cs
+++ b/TBF/UI/Bench/Metrology/MetrologyDlg.cs
@@ -26,6 +26,8 @@ namespace TBF.UI.Bench.Metrology
 		{
 			InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             /// SharedDlgButtons configuration
             sharedButtons.ParentForm = this;
             sharedButtons.RequiredGroupMembership = new GID[] { GID.Metrologists,
diff --git a/TBF/UI/Bench/Paths/PathsDlg.cs b/TBF/UI/Bench/Paths/PathsDlg.cs
index ef6747614..4bd8e04f8 100644
--- a/TBF/UI/Bench/Paths/PathsDlg.cs
+++ b/TBF/UI/Bench/Paths/PathsDlg.cs
@@ -52,7 +52,9 @@ namespace TBF.UI.Bench.Paths
 
 			InitializeComponent();
 
-			/// SharedDlgButtons configuration
+            this.Icon = Properties.Resources.TBF_icon;
+
+            /// SharedDlgButtons configuration
             sharedButtons.ParentForm = this;
             sharedButtons.RequiredGroupMembership = new GID[] { GID.Metrologists };
 			sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove |
diff --git a/TBF/UI/Bench/TestProfiles/TestProfileDlg.cs b/TBF/UI/Bench/TestProfiles/TestProfileDlg.cs
index 69543645c..808c23986 100644
--- a/TBF/UI/Bench/TestProfiles/TestProfileDlg.cs
+++ b/TBF/UI/Bench/TestProfiles/TestProfileDlg.cs
@@ -42,6 +42,8 @@ namespace TBF.UI.Bench.TestProfiles
         {
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             /// Detect display setting: 100% = 96dpi, 125% = 120dpi, 150% = 144dpi.
             Dpi = (int)this.CreateGraphics().DpiX;
             openUnlocked = false;
diff --git a/TBF/UI/Bench/TestProfiles/TestProfilesDlg.cs b/TBF/UI/Bench/TestProfiles/TestProfilesDlg.cs
index a045fd0fc..95c098818 100644
--- a/TBF/UI/Bench/TestProfiles/TestProfilesDlg.cs
+++ b/TBF/UI/Bench/TestProfiles/TestProfilesDlg.cs
@@ -26,7 +26,9 @@ namespace TBF.UI.Bench.TestProfiles
 
 			InitializeComponent();
 
-			/// SharedDlgButtons configuration
+            this.Icon = Properties.Resources.TBF_icon;
+
+            /// SharedDlgButtons configuration
             sharedButtons.ParentForm = this;
             sharedButtons.RequiredGroupMembership = new GID[] { GID.MetrologicalAuthority };
 
diff --git a/TBF/UI/Bench/Transitions/TransitionsDlg.cs b/TBF/UI/Bench/Transitions/TransitionsDlg.cs
index b463c6863..19088421e 100644
--- a/TBF/UI/Bench/Transitions/TransitionsDlg.cs
+++ b/TBF/UI/Bench/Transitions/TransitionsDlg.cs
@@ -65,7 +65,9 @@ namespace TBF.UI.Bench.Transitions
 
 			InitializeComponent();
 
-			/// SharedDlgButtons configuration
+            this.Icon = Properties.Resources.TBF_icon;
+
+            /// SharedDlgButtons configuration
             sharedButtons.ParentForm = this;
             sharedButtons.RequiredGroupMembership = new GID[] { GID.Metrologists };
 			sharedButtons.OptionalButtons = SharedButtons.Buttons.Add | SharedButtons.Buttons.Remove |
diff --git a/TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs b/TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs
index 3a841b252..1bac42504 100644
--- a/TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs
+++ b/TBF/UI/Bench/Uncertainties/UncertaintiesDlg.cs
@@ -26,6 +26,8 @@ namespace TBF.UI.Bench.Uncertainties
 		{
 			InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             /// SharedDlgButtons configuration
             sharedButtons.ParentForm = this;
 //#if LANG_PL
diff --git a/TBF/UI/Calendar/EventDetailsForm.cs b/TBF/UI/Calendar/EventDetailsForm.cs
index e5726daf7..85c852851 100644
--- a/TBF/UI/Calendar/EventDetailsForm.cs
+++ b/TBF/UI/Calendar/EventDetailsForm.cs
@@ -33,6 +33,9 @@ namespace TBF.UI.Calendar
         public EventDetailsForm()
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             Text = Strings.Event_details;
             for (Frequency f = Frequency.Once; f < Frequency.Count; f++)
             {
diff --git a/TBF/UI/DummyDlg.cs b/TBF/UI/DummyDlg.cs
index 0d12aa1a0..758018f1b 100644
--- a/TBF/UI/DummyDlg.cs
+++ b/TBF/UI/DummyDlg.cs
@@ -10,6 +10,8 @@ namespace TBF.UI
         public DummyDlg()
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
         }
     }
 }
diff --git a/TBF/UI/Help/AboutDlg.cs b/TBF/UI/Help/AboutDlg.cs
index ab37dad8b..9acf90023 100644
--- a/TBF/UI/Help/AboutDlg.cs
+++ b/TBF/UI/Help/AboutDlg.cs
@@ -25,7 +25,9 @@ namespace TBF.UI.Help
         {
             InitializeComponent();
 
-			Text = Strings.About_Test_Bench_Framework;
+            this.Icon = Properties.Resources.TBF_icon;
+
+            Text = Strings.About_Test_Bench_Framework;
 			copyrightLabel.Text = string.Format(Strings.CopyrightStr, DateTime.Now.Year);
 			versionLabel.Text = String.Format(Strings.VersionStr, Program.Version);
             buildDateLabel.Text = String.Format(Strings.BuildDateStr, Program.BuildDateTime.ToString(Constants.DateFormat));
diff --git a/TBF/UI/MainWnd.cs b/TBF/UI/MainWnd.cs
index 8a046c81e..569eecb23 100644
--- a/TBF/UI/MainWnd.cs
+++ b/TBF/UI/MainWnd.cs
@@ -111,12 +111,15 @@ namespace TBF.UI
         /// </summary>
         public MainWnd()
         {
+            this.Icon = Properties.Resources.TBF_icon;
             /// Detect display setting: 100% = 96dpi, 125% = 120dpi, 150% = 144dpi.
             Dpi = (int)this.CreateGraphics().DpiX;
 
             InitializeComponent();
 
-			Text = string.Format("{0}  ver. {1} - {2}{3}", Strings.Test_Bench_Framework, Program.Version,
+            this.Icon = Properties.Resources.TBF_icon;
+
+            Text = string.Format("{0}  ver. {1} - {2}{3}", Strings.Test_Bench_Framework, Program.Version,
                                  TBF.DB.CurrentBench.BenchName, TBF.DB.CurrentBench.IsRealBench ? "" : Strings._offline);
 
             localProcedures = new List<Procedure>();
diff --git a/TBF/UI/MainWnd.resx b/TBF/UI/MainWnd.resx
index 03b8d6109..7baab3679 100644
--- a/TBF/UI/MainWnd.resx
+++ b/TBF/UI/MainWnd.resx
@@ -739,7 +739,7 @@
     <value>processTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;processTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.UI.Process.ProcessTabPageCtrl, TBF, Version=3.9.2144.1, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.UI.Process.ProcessTabPageCtrl, TBF, Version=3.9.2149.4, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;processTabPageCtrl.Parent" xml:space="preserve">
     <value>processTabPage</value>
@@ -817,7 +817,7 @@
     <value>resultsTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;resultsTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.UI.ResultsMI.ResultsTabPageCtrl, TBF, Version=3.9.2144.1, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.UI.ResultsMI.ResultsTabPageCtrl, TBF, Version=3.9.2149.4, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;resultsTabPageCtrl.Parent" xml:space="preserve">
     <value>resultsTabPage</value>
@@ -871,7 +871,7 @@
     <value>graphsTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;graphsTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.UI.Graphs.GraphsTabPageCtrl, TBF, Version=3.9.2144.1, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.UI.Graphs.GraphsTabPageCtrl, TBF, Version=3.9.2149.4, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;graphsTabPageCtrl.Parent" xml:space="preserve">
     <value>graphsTabPage</value>
@@ -925,7 +925,7 @@
     <value>eventLogsTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;eventLogsTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.UI.EventLogs.EventLogsTabPageCtrl, TBF, Version=3.9.2144.1, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.UI.EventLogs.EventLogsTabPageCtrl, TBF, Version=3.9.2149.4, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;eventLogsTabPageCtrl.Parent" xml:space="preserve">
     <value>eventLogsTabPage</value>
@@ -979,7 +979,7 @@
     <value>calendarTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;calendarTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.UI.Calendar.CalendarTabPageCtrl, TBF, Version=3.9.2144.1, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.UI.Calendar.CalendarTabPageCtrl, TBF, Version=3.9.2149.4, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;calendarTabPageCtrl.Parent" xml:space="preserve">
     <value>calendarTabPage</value>
@@ -1033,7 +1033,7 @@
     <value>picturesTabPageCtrl</value>
   </data>
   <data name="&gt;&gt;picturesTabPageCtrl.Type" xml:space="preserve">
-    <value>TBF.UI.Camera.PicturesTabPageCtrl, TBF, Version=3.9.2144.1, Culture=neutral, PublicKeyToken=null</value>
+    <value>TBF.UI.Camera.PicturesTabPageCtrl, TBF, Version=3.9.2149.4, Culture=neutral, PublicKeyToken=null</value>
   </data>
   <data name="&gt;&gt;picturesTabPageCtrl.Parent" xml:space="preserve">
     <value>picturesTabPage</value>
diff --git a/TBF/UI/Procedures/ProcedureDlg.cs b/TBF/UI/Procedures/ProcedureDlg.cs
index 94b3c982b..8e7382cdf 100644
--- a/TBF/UI/Procedures/ProcedureDlg.cs
+++ b/TBF/UI/Procedures/ProcedureDlg.cs
@@ -72,6 +72,8 @@ namespace TBF.UI.Procedures
 		{
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             /// Detect display setting: 100% = 96dpi, 125% = 120dpi, 150% = 144dpi.
 			Dpi = (int)this.CreateGraphics().DpiX;
 		}
diff --git a/TBF/UI/Procedures/ProceduresDlg.cs b/TBF/UI/Procedures/ProceduresDlg.cs
index b40fe4748..9d818dea1 100644
--- a/TBF/UI/Procedures/ProceduresDlg.cs
+++ b/TBF/UI/Procedures/ProceduresDlg.cs
@@ -24,7 +24,9 @@ namespace TBF.UI.Procedures
 
 			InitializeComponent();
 
-			/// SharedDlgButtons configuration
+            this.Icon = Properties.Resources.TBF_icon;
+
+            /// SharedDlgButtons configuration
             sharedButtons.ParentForm = this;
             sharedButtons.RequiredGroupMembership = new GID[] { GID.TestingSpecialists, GID.Metrologists };
 
diff --git a/TBF/UI/Procedures/TestWizard/ConfirmUpdatingTests.cs b/TBF/UI/Procedures/TestWizard/ConfirmUpdatingTests.cs
index 1ce4b2eed..58431d936 100644
--- a/TBF/UI/Procedures/TestWizard/ConfirmUpdatingTests.cs
+++ b/TBF/UI/Procedures/TestWizard/ConfirmUpdatingTests.cs
@@ -19,6 +19,8 @@ namespace TBF.UI.Procedures.TestWizard
 
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             Text = Strings.Confirmation;
             messageLabel.Text = Strings.Do_you_want_to_update_tests_QM;
             backButton.Text = Strings.BackBtnText;
diff --git a/TBF/UI/Procedures/TestWizard/FlowSelection.cs b/TBF/UI/Procedures/TestWizard/FlowSelection.cs
index c0b320516..91cc512e9 100644
--- a/TBF/UI/Procedures/TestWizard/FlowSelection.cs
+++ b/TBF/UI/Procedures/TestWizard/FlowSelection.cs
@@ -32,6 +32,8 @@ namespace TBF.UI.Procedures.TestWizard
 		{
 			InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             qSpec = QSpec.Qfrom_Qto;
             Text = Strings.Flow_selection;
             qFromLabel.Text = Strings.Q_from;
diff --git a/TBF/UI/Procedures/TestWizard/HeatMetersSelection.cs b/TBF/UI/Procedures/TestWizard/HeatMetersSelection.cs
index 31b9e9c2b..2245de756 100644
--- a/TBF/UI/Procedures/TestWizard/HeatMetersSelection.cs
+++ b/TBF/UI/Procedures/TestWizard/HeatMetersSelection.cs
@@ -12,9 +12,11 @@ namespace TBF.UI.Procedures.TestWizard
 		public HeatMetersSelection()
 		{
 			InitializeComponent();
-		}
 
-		public HeatMetersSelection(bool first, bool last, Test test)
+            this.Icon = Properties.Resources.TBF_icon;
+        }
+
+        public HeatMetersSelection(bool first, bool last, Test test)
 			: this()
 		{
 			this.test = test;
diff --git a/TBF/UI/Procedures/TestWizard/MethodSelection.cs b/TBF/UI/Procedures/TestWizard/MethodSelection.cs
index 9bb265c6b..ff3894328 100644
--- a/TBF/UI/Procedures/TestWizard/MethodSelection.cs
+++ b/TBF/UI/Procedures/TestWizard/MethodSelection.cs
@@ -22,9 +22,11 @@ namespace TBF.UI.Procedures.TestWizard
 		public MethodSelection()
 		{
 			InitializeComponent();
-		}
 
-		public MethodSelection(bool first, bool last,
+            this.Icon = Properties.Resources.TBF_icon;
+        }
+
+        public MethodSelection(bool first, bool last,
 							   Test test,
 							   IList<Rig.GenericDevices.ITestMethod> methods)
 			: this()
diff --git a/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs b/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs
index 73193c181..d1560a6e1 100644
--- a/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs
+++ b/TBF/UI/Procedures/TestWizard/OracleWZTypSelection.cs
@@ -42,7 +42,9 @@ namespace TBF.UI.Procedures.TestWizard
             this.testMethods = testMethods;
 
             InitializeComponent();
-            
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             Text = Strings.Method_selection;
 			backButton.Text = Strings.BackBtnText;
 			nextButton.Text = Strings.NextBtnText;
diff --git a/TBF/UI/Procedures/TestWizard/PressureSelection.cs b/TBF/UI/Procedures/TestWizard/PressureSelection.cs
index 26ee25a9b..a89b43fc8 100644
--- a/TBF/UI/Procedures/TestWizard/PressureSelection.cs
+++ b/TBF/UI/Procedures/TestWizard/PressureSelection.cs
@@ -18,9 +18,11 @@ namespace TBF.UI.Procedures.TestWizard
 		public PressureSelection()
 		{
 			InitializeComponent();
-		}
 
-		public PressureSelection(bool first, bool last, Test test)
+            this.Icon = Properties.Resources.TBF_icon;
+        }
+
+        public PressureSelection(bool first, bool last, Test test)
 			: this()
 		{
 			this.test = test;
diff --git a/TBF/UI/Procedures/TestWizard/Roi1.cs b/TBF/UI/Procedures/TestWizard/Roi1.cs
index 17945e526..de9f0ab33 100644
--- a/TBF/UI/Procedures/TestWizard/Roi1.cs
+++ b/TBF/UI/Procedures/TestWizard/Roi1.cs
@@ -19,9 +19,11 @@ namespace TBF.UI.Procedures.TestWizard
 		public Roi1()
 		{
 			InitializeComponent();
-		}
 
-		public Roi1(bool first, bool last, RoiData roiData)
+            this.Icon = Properties.Resources.TBF_icon;
+        }
+
+        public Roi1(bool first, bool last, RoiData roiData)
 			: this()
 		{
 			this.roiData = roiData;
diff --git a/TBF/UI/Procedures/TestWizard/Roi2.cs b/TBF/UI/Procedures/TestWizard/Roi2.cs
index a920b5202..cc5b1496b 100644
--- a/TBF/UI/Procedures/TestWizard/Roi2.cs
+++ b/TBF/UI/Procedures/TestWizard/Roi2.cs
@@ -15,9 +15,11 @@ namespace TBF.UI.Procedures.TestWizard
 		public Roi2()
 		{
 			InitializeComponent();
-		}
 
-		public Roi2(bool first, bool last, RoiData roiData)
+            this.Icon = Properties.Resources.TBF_icon;
+        }
+
+        public Roi2(bool first, bool last, RoiData roiData)
 			: this()
 		{
 			this.roiData = roiData;
diff --git a/TBF/UI/Procedures/TestWizard/Roi3.cs b/TBF/UI/Procedures/TestWizard/Roi3.cs
index ce0ca0529..b39f5d6d8 100644
--- a/TBF/UI/Procedures/TestWizard/Roi3.cs
+++ b/TBF/UI/Procedures/TestWizard/Roi3.cs
@@ -15,9 +15,11 @@ namespace TBF.UI.Procedures.TestWizard
 		public Roi3()
 		{
 			InitializeComponent();
-		}
 
-		public Roi3(bool first, bool last, RoiData roiData)
+            this.Icon = Properties.Resources.TBF_icon;
+        }
+
+        public Roi3(bool first, bool last, RoiData roiData)
 			: this()
 		{
 			this.roiData = roiData;
diff --git a/TBF/UI/Procedures/TestWizard/TestProfileSelection.cs b/TBF/UI/Procedures/TestWizard/TestProfileSelection.cs
index 657020c74..1dadda33f 100644
--- a/TBF/UI/Procedures/TestWizard/TestProfileSelection.cs
+++ b/TBF/UI/Procedures/TestWizard/TestProfileSelection.cs
@@ -63,6 +63,8 @@ namespace TBF.UI.Procedures.TestWizard
 
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             /// Find possible selector values
             selectorVals = new List<string>();
             foreach (var p in fPaths) if (!string.IsNullOrEmpty(p.Selector) && !selectorVals.Contains(p.Selector)) selectorVals.Add(p.Selector);
diff --git a/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs b/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs
index 473324715..e8dba5428 100644
--- a/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs
+++ b/TBF/UI/Procedures/TestWizard/VolumeAndErrorSelection.cs
@@ -26,6 +26,8 @@ namespace TBF.UI.Procedures.TestWizard
 		{
 			InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             tabId = 0;
 
             Text = Strings.Volume_and_error_selection;
diff --git a/TBF/UI/ResultsMI/DeleteFromOracleForm.cs b/TBF/UI/ResultsMI/DeleteFromOracleForm.cs
index 65ec91742..d0a532851 100644
--- a/TBF/UI/ResultsMI/DeleteFromOracleForm.cs
+++ b/TBF/UI/ResultsMI/DeleteFromOracleForm.cs
@@ -32,6 +32,8 @@ namespace TBF.UI.ResultsMI
         {
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             testBenchName = ProcessData.BenchInfo.TestBenchName;
             testBenchId = ProcessData.BenchInfo.TestBenchId;
 
diff --git a/TBF/UI/ResultsMI/PreviousResultsDlg.cs b/TBF/UI/ResultsMI/PreviousResultsDlg.cs
index 67619b9df..438c0826a 100644
--- a/TBF/UI/ResultsMI/PreviousResultsDlg.cs
+++ b/TBF/UI/ResultsMI/PreviousResultsDlg.cs
@@ -47,7 +47,10 @@ namespace TBF.UI.ResultsMI
         public PreviousResultsDlg(PreviousResultsMode mode)
 		{
 			InitializeComponent();
-			this.mode = mode;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            this.mode = mode;
 			currentBatchNr = Program.LocalSettings.BatchNr;
 
             PrintHandler += delegate(object sndr, PreviousResultIdEventArgs args)
diff --git a/TBF/UI/ResultsMI/PrintResultsSelectionDlg.cs b/TBF/UI/ResultsMI/PrintResultsSelectionDlg.cs
index 01a4cb943..dbf78cc38 100644
--- a/TBF/UI/ResultsMI/PrintResultsSelectionDlg.cs
+++ b/TBF/UI/ResultsMI/PrintResultsSelectionDlg.cs
@@ -21,6 +21,8 @@ namespace TBF.UI.ResultsMI
 
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             Localize();
 
             if (printers != null)
diff --git a/TBF/UI/ResultsMI/ResultsArrangementDlg.cs b/TBF/UI/ResultsMI/ResultsArrangementDlg.cs
index 38b3ba428..e97892467 100644
--- a/TBF/UI/ResultsMI/ResultsArrangementDlg.cs
+++ b/TBF/UI/ResultsMI/ResultsArrangementDlg.cs
@@ -48,7 +48,10 @@ namespace TBF.UI.ResultsMI
 		public ResultsArrangementDlg()
 		{
 			InitializeComponent();
-			resultsConfigCtrl.SupressTestIDColumn = true;
+
+            this.Icon = Properties.Resources.TBF_icon;
+
+            resultsConfigCtrl.SupressTestIDColumn = true;
 
 			Unlocked = false;
 			cancelButton.Visible = false;
diff --git a/TBF/UI/ResultsMI/SendAgainDBAndWMSelectionForm.cs b/TBF/UI/ResultsMI/SendAgainDBAndWMSelectionForm.cs
index b96a0b37d..abbae0cc9 100644
--- a/TBF/UI/ResultsMI/SendAgainDBAndWMSelectionForm.cs
+++ b/TBF/UI/ResultsMI/SendAgainDBAndWMSelectionForm.cs
@@ -17,6 +17,8 @@ namespace TBF.UI.ResultsMI
         {
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             Localize();
 
             databaseComboBox.Items.Add(DBUsed.Production);
diff --git a/TBF/UI/Settings/BenchesDlg.cs b/TBF/UI/Settings/BenchesDlg.cs
index 66bba3242..6772e770e 100644
--- a/TBF/UI/Settings/BenchesDlg.cs
+++ b/TBF/UI/Settings/BenchesDlg.cs
@@ -30,6 +30,9 @@ namespace TBF.UI.Settings
 			if (localSettings == null) throw new Exception("Cannot load local settings");
 
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             RedrawTestBenchesListBox();
             CurrentDBChanged = false;
         }
diff --git a/TBF/UI/Settings/DatabaseSettingsDlg.cs b/TBF/UI/Settings/DatabaseSettingsDlg.cs
index c5f836bdf..e59232afd 100644
--- a/TBF/UI/Settings/DatabaseSettingsDlg.cs
+++ b/TBF/UI/Settings/DatabaseSettingsDlg.cs
@@ -42,9 +42,11 @@ namespace TBF.UI.Settings
             CurrentDBChanged = false;
 
             InitializeComponent();
+
+        
         }
 
-		void Localize()
+        void Localize()
 		{
 			Text = Strings.Test_Bench_Databases_Specification;
 			label1.Text = Strings.Test_bench_name;
diff --git a/TBF/UI/Settings/LanguageDlg.cs b/TBF/UI/Settings/LanguageDlg.cs
index d901e3899..c41b4b82b 100644
--- a/TBF/UI/Settings/LanguageDlg.cs
+++ b/TBF/UI/Settings/LanguageDlg.cs
@@ -67,6 +67,8 @@ namespace TBF.UI.Settings
 
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             // Initialize the list box with langauges
             for (int i = 0; i < LanguageName.Length; i++)
             {
diff --git a/TBF/UI/Settings/UpgradeSelectionDlg.cs b/TBF/UI/Settings/UpgradeSelectionDlg.cs
index 3ebec7add..092cbbb6d 100644
--- a/TBF/UI/Settings/UpgradeSelectionDlg.cs
+++ b/TBF/UI/Settings/UpgradeSelectionDlg.cs
@@ -30,6 +30,8 @@ namespace TBF.UI.Settings
         {
             InitializeComponent();
 
+            this.Icon = Properties.Resources.TBF_icon;
+
             upgradeConfigDBCheckBox.Checked = true;
             upgradeResultsDBCheckBox.Checked = true;
         }
diff --git a/TBF/UI/Shared/ClosingTbfForm.cs b/TBF/UI/Shared/ClosingTbfForm.cs
index ebae315d6..1f065c8f2 100644
--- a/TBF/UI/Shared/ClosingTbfForm.cs
+++ b/TBF/UI/Shared/ClosingTbfForm.cs
@@ -14,6 +14,9 @@ namespace TBF.UI.Shared
         public ClosingTbfForm()
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             ShutDownPC = false;
             Text = Strings.Closing_the_program;
             messageLabel.Text = Strings.Do_you_want_to_exit_TBF;
diff --git a/TBF/UI/Shared/ErrorDlg.cs b/TBF/UI/Shared/ErrorDlg.cs
index 94839523b..d50127fca 100644
--- a/TBF/UI/Shared/ErrorDlg.cs
+++ b/TBF/UI/Shared/ErrorDlg.cs
@@ -21,9 +21,12 @@ namespace TBF.UI.Shared
 		public ErrorDlg()
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
         }
 
-		public ErrorDlg(string ErrorDescription)
+        public ErrorDlg(string ErrorDescription)
 			: this()
 		{
 			textBoxMessage.Text = ErrorDescription;
diff --git a/TBF/UI/Shared/LoginDlgWithBenchSelection.cs b/TBF/UI/Shared/LoginDlgWithBenchSelection.cs
index 902f96cbd..a85d167c1 100644
--- a/TBF/UI/Shared/LoginDlgWithBenchSelection.cs
+++ b/TBF/UI/Shared/LoginDlgWithBenchSelection.cs
@@ -45,7 +45,9 @@ namespace TBF.UI.Shared
         public LoginDlgWithBenchSelection()
         {
             InitializeComponent();
-		}
+
+            this.Icon = Properties.Resources.TBF_icon;
+        }
 
         /// <summary>
         /// Constructor with a predefined bench.
diff --git a/TBF/UI/Shared/ModelessActivityForm.cs b/TBF/UI/Shared/ModelessActivityForm.cs
index d12978769..9fdc189e3 100644
--- a/TBF/UI/Shared/ModelessActivityForm.cs
+++ b/TBF/UI/Shared/ModelessActivityForm.cs
@@ -38,6 +38,9 @@ namespace TBF.UI.Shared
         public ModelessActivityForm()
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             ControlBox = false;
 
             CloseFormHandler += HandleCloseFormCommand;
diff --git a/TBF/UI/Shared/NoBenchOrDatabaseDlg.cs b/TBF/UI/Shared/NoBenchOrDatabaseDlg.cs
index ade485ae7..0e2e38983 100644
--- a/TBF/UI/Shared/NoBenchOrDatabaseDlg.cs
+++ b/TBF/UI/Shared/NoBenchOrDatabaseDlg.cs
@@ -21,6 +21,8 @@ namespace TBF.UI.Shared
         public NoBenchOrDatabaseDlg()
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
         }
 
         private void NoDatabaseMsgDlg_Load(object sender, EventArgs e)
diff --git a/TBF/UI/Shared/PrintOrderForm.cs b/TBF/UI/Shared/PrintOrderForm.cs
index 44b2f5781..0a3eb74e3 100644
--- a/TBF/UI/Shared/PrintOrderForm.cs
+++ b/TBF/UI/Shared/PrintOrderForm.cs
@@ -23,9 +23,11 @@ namespace TBF.UI.Shared
 		public PrintOrderForm()
 		{
 			InitializeComponent();
-		}
 
-		private void PrintOrderForm_Load(object sender, EventArgs e)
+            this.Icon = Properties.Resources.TBF_icon;
+        }
+
+        private void PrintOrderForm_Load(object sender, EventArgs e)
 		{
 			Localize();
 
diff --git a/TBF/UI/Shared/RemarkDlg.cs b/TBF/UI/Shared/RemarkDlg.cs
index 12dbd814f..0c0dbb3e0 100644
--- a/TBF/UI/Shared/RemarkDlg.cs
+++ b/TBF/UI/Shared/RemarkDlg.cs
@@ -11,6 +11,9 @@ namespace TBF.UI.Shared
         public RemarkDlg()
         {
             InitializeComponent();
+
+            this.Icon = Properties.Resources.TBF_icon;
+
             Text = Strings.Remark;
             textBox1.Text = Remark;
         }
diff --git a/TBF/UI/Shared/TabNameDlg.cs b/TBF/UI/Shared/TabNameDlg.cs
index 91379a375..460ceb1cf 100644
--- a/TBF/UI/Shared/TabNameDlg.cs
+++ b/TBF/UI/Shared/TabNameDlg.cs
@@ -17,7 +17,9 @@ namespace TBF.UI.Shared
 		{
 			InitializeComponent();
 
-			TabNameLabel = string.Empty;
+            this.Icon = Properties.Resources.TBF_icon;
+
+            TabNameLabel = string.Empty;
 			TabName = string.Empty;
 			IsVirtualBenchSeq = false;
 		}