diff --git a/src/System.Waf/Samples/InformationManager/Infrastructure.Interfaces/Applications/ToolBarCommand.cs b/src/System.Waf/Samples/InformationManager/Infrastructure.Interfaces/Applications/ToolBarCommand.cs
index 52902760..14387f24 100644
--- a/src/System.Waf/Samples/InformationManager/Infrastructure.Interfaces/Applications/ToolBarCommand.cs
+++ b/src/System.Waf/Samples/InformationManager/Infrastructure.Interfaces/Applications/ToolBarCommand.cs
@@ -3,28 +3,7 @@
 namespace Waf.InformationManager.Infrastructure.Interfaces.Applications;
 
 /// <summary>Defines a tool bar command</summary>
-public class ToolBarCommand
-{
-    /// <summary>Initializes a new instance of the <see cref="ToolBarCommand"/> class.</summary>
-    /// <param name="command">The command which is invoked when the user clicks on the tool bar button.</param>
-    /// <param name="text">The text of the tool bar button.</param>
-    /// <param name="toolTip">The tooltip of the tool bar button.</param>
-    /// <exception cref="ArgumentNullException">command must not be null.</exception>
-    /// <exception cref="ArgumentException">text must not be null or empty.</exception>
-    public ToolBarCommand(ICommand command, string text, string? toolTip = null)
-    {
-        Command = command ?? throw new ArgumentNullException(nameof(command));
-        if (string.IsNullOrEmpty(text)) throw new ArgumentException("text must not be null or empty.", nameof(text));
-        Text = text;
-        ToolTip = toolTip ?? "";
-    }
-
-    /// <summary>Gets the command which is invoked when the user clicks on the tool bar button.</summary>
-    public ICommand Command { get; }
-
-    /// <summary>Gets the text of the tool bar button.</summary>
-    public string Text { get; }
-
-    /// <summary>Gets the tool tip of the tool bar button.</summary>
-    public string ToolTip { get; }
-}
+/// <param name="Command">The command which is invoked when the user clicks on the tool bar button.</param>
+/// <param name="Text">The text of the tool bar button.</param>
+/// <param name="ToolTip">The tooltip of the tool bar button.</param>
+public record ToolBarCommand(ICommand Command, string Text, string? ToolTip = null);
diff --git a/src/System.Waf/Samples/InformationManager/Infrastructure.Modules.Applications.Test/Services/ToolBarCommandTest.cs b/src/System.Waf/Samples/InformationManager/Infrastructure.Modules.Applications.Test/Services/ToolBarCommandTest.cs
deleted file mode 100644
index 606594b0..00000000
--- a/src/System.Waf/Samples/InformationManager/Infrastructure.Modules.Applications.Test/Services/ToolBarCommandTest.cs
+++ /dev/null
@@ -1,27 +0,0 @@
-using Microsoft.VisualStudio.TestTools.UnitTesting;
-using System.Waf.Applications;
-using System.Waf.UnitTesting;
-using Waf.InformationManager.Infrastructure.Interfaces.Applications;
-
-namespace Test.InformationManager.Infrastructure.Modules.Applications.Services;
-
-[TestClass]
-public class ToolBarCommandTest
-{
-    [TestMethod]
-    public void ConstructorTest()
-    {
-        var emptyCommand = new DelegateCommand(() => { });
-
-        AssertHelper.ExpectedException<ArgumentNullException>(() => new ToolBarCommand(null!, null!));
-        AssertHelper.ExpectedException<ArgumentException>(() => new ToolBarCommand(emptyCommand, null!));
-
-        var toolBarCommand1 = new ToolBarCommand(emptyCommand, "Command 1");
-        Assert.AreEqual(emptyCommand, toolBarCommand1.Command);
-        Assert.AreEqual("Command 1", toolBarCommand1.Text);
-        Assert.AreEqual("", toolBarCommand1.ToolTip);
-
-        var toolBarCommand2 = new ToolBarCommand(emptyCommand, "Command 2", "ToolTip 2");
-        Assert.AreEqual("ToolTip 2", toolBarCommand2.ToolTip);
-    }
-}