diff --git a/CQRSSample.Commands/CQRSSample.Commands.csproj b/CQRSSample.Commands/CQRSSample.Commands.csproj
index d8c1e7f..852b82c 100644
--- a/CQRSSample.Commands/CQRSSample.Commands.csproj
+++ b/CQRSSample.Commands/CQRSSample.Commands.csproj
@@ -34,11 +34,13 @@
     <Reference Include="FluentValidation">
       <HintPath>..\External Libs\FluentValidation\FluentValidation.dll</HintPath>
     </Reference>
+    <Reference Include="Microsoft.CSharp" />
     <Reference Include="System" />
   </ItemGroup>
   <ItemGroup>
     <Compile Include="Command.cs" />
     <Compile Include="CreateCustomerCommand.cs" />
+    <Compile Include="DynamicCommand.cs" />
     <Compile Include="Properties\AssemblyInfo.cs" />
     <Compile Include="RelocatingCustomerCommand.cs" />
   </ItemGroup>
diff --git a/CQRSSample.Commands/DynamicCommand.cs b/CQRSSample.Commands/DynamicCommand.cs
index 3dcd432..b0cb0ae 100644
--- a/CQRSSample.Commands/DynamicCommand.cs
+++ b/CQRSSample.Commands/DynamicCommand.cs
@@ -1,7 +1,16 @@
-namespace CQRSSample.Commands
+using System.Dynamic;
+
+namespace CQRSSample.Commands
 {
-    public class DynamicCommand
+    public class DynamicCommand<T> : DynamicObject where T : Command
     {
-        private readonly dynamic _innerCommand; 
+        private readonly dynamic _innerCommand;
+
+        public DynamicCommand(T command)
+        {
+            _innerCommand = command;
+        }
+
+        public T InnerCommand { get { return _innerCommand; } }
     }
 }
\ No newline at end of file
diff --git a/CQRSSample.Commands/RelocatingCustomerCommand.cs b/CQRSSample.Commands/RelocatingCustomerCommand.cs
index f2992b6..b694cd5 100644
--- a/CQRSSample.Commands/RelocatingCustomerCommand.cs
+++ b/CQRSSample.Commands/RelocatingCustomerCommand.cs
@@ -1,4 +1,5 @@
 using System;
+using FluentValidation;
 
 namespace CQRSSample.Commands
 {
@@ -20,4 +21,12 @@ public RelocatingCustomerCommand(Guid id, string street, string streetNumber, st
             City = city;
         }
     }
+
+    public class RelocatingCustomerValidator : AbstractValidator<RelocatingCustomerCommand>
+    {
+        public RelocatingCustomerValidator()
+        {
+            RuleFor(command => command.City).NotEmpty().NotNull();
+        }
+    }
 }
diff --git a/CQRSSample.WpfClient/App.xaml b/CQRSSample.WpfClient/App.xaml
index ed9a04b..6f0a924 100644
--- a/CQRSSample.WpfClient/App.xaml
+++ b/CQRSSample.WpfClient/App.xaml
@@ -11,7 +11,6 @@
                 </ResourceDictionary>
                 <ResourceDictionary Source="Themes\ExpressionDark.xaml" />
                 <ResourceDictionary Source="ApplicationFramework\Resources\ConverterResource.xaml" />
-                <ResourceDictionary Source="ApplicationFramework\Resources\Style.xaml" />
             </ResourceDictionary.MergedDictionaries>
         </ResourceDictionary>
     </Application.Resources>
diff --git a/CQRSSample.WpfClient/ApplicationFramework/Icons/customer.png b/CQRSSample.WpfClient/ApplicationFramework/Icons/customer.png
new file mode 100644
index 0000000..bb30814
Binary files /dev/null and b/CQRSSample.WpfClient/ApplicationFramework/Icons/customer.png differ
diff --git a/CQRSSample.WpfClient/ApplicationFramework/Icons/no.png b/CQRSSample.WpfClient/ApplicationFramework/Icons/no.png
new file mode 100644
index 0000000..93e171f
Binary files /dev/null and b/CQRSSample.WpfClient/ApplicationFramework/Icons/no.png differ
diff --git a/CQRSSample.WpfClient/ApplicationFramework/Resources/Style.xaml b/CQRSSample.WpfClient/ApplicationFramework/Resources/Style.xaml
deleted file mode 100644
index 5490324..0000000
--- a/CQRSSample.WpfClient/ApplicationFramework/Resources/Style.xaml
+++ /dev/null
@@ -1,26 +0,0 @@
-<ResourceDictionary xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
-                    xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml">
-
-    <!-- Validating TextBox-->
-    <Style x:Key="ValidatingTextBox" TargetType="{x:Type TextBox}">
-        <Setter Property="Margin" Value="3" />
-        <Setter Property="Validation.ErrorTemplate">
-            <Setter.Value>
-                <ControlTemplate>
-                    <DockPanel DockPanel.Dock="Right" >
-                        <AdornedElementPlaceholder />
-                        <Image Source="/ApplicationFramework/Icons/customers.png" Width="15" Height="15" ToolTip="{Binding Path=AdornedElement.ToolTip, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Adorner}}}" />
-                    </DockPanel>
-                </ControlTemplate>
-            </Setter.Value>
-        </Setter>
-        <Style.Triggers>
-            <Trigger Property="Validation.HasError" Value="True">
-                <Setter Property="ToolTip" Value="{Binding RelativeSource={x:Static RelativeSource.Self}, 
-                        Path=(Validation.Errors)[0].ErrorContent}" />
-            </Trigger>
-        </Style.Triggers>
-    </Style>
-
-
-</ResourceDictionary>
\ No newline at end of file
diff --git a/CQRSSample.WpfClient/ApplicationFramework/ScreenWithValidatingCommand.cs b/CQRSSample.WpfClient/ApplicationFramework/ScreenWithValidatingCommand.cs
new file mode 100644
index 0000000..6f084ad
--- /dev/null
+++ b/CQRSSample.WpfClient/ApplicationFramework/ScreenWithValidatingCommand.cs
@@ -0,0 +1,22 @@
+using Caliburn.Micro;
+using CQRSSample.Commands;
+using FluentValidation;
+using FluentValidation.Results;
+
+namespace CQRSSample.WpfClient.ApplicationFramework
+{
+    public class ScreenWithValidatingCommand<T> : Screen where T : Command
+    {
+        public ValidatingCommand<T> Command { get; protected set; }
+
+        public IValidator<T> Validator { get; set; }
+
+        /// <summary>
+        /// Validates the command
+        /// </summary>
+        protected virtual ValidationResult Validate()
+        {
+            return Command.Validate();
+        }
+    }
+}
\ No newline at end of file
diff --git a/CQRSSample.WpfClient/ApplicationFramework/ValidatingCommand.cs b/CQRSSample.WpfClient/ApplicationFramework/ValidatingCommand.cs
new file mode 100644
index 0000000..ee1d95e
--- /dev/null
+++ b/CQRSSample.WpfClient/ApplicationFramework/ValidatingCommand.cs
@@ -0,0 +1,76 @@
+using System;
+using System.ComponentModel;
+using System.Dynamic;
+using System.Linq;
+using System.Linq.Expressions;
+using System.Text;
+using CQRSSample.Commands;
+using FluentValidation;
+using FluentValidation.Results;
+
+namespace CQRSSample.WpfClient.ApplicationFramework
+{
+    public class ValidatingCommand<T> : DynamicCommand<T>, IDataErrorInfo where T : Command
+    {
+        private readonly IValidator<T> _validator;
+
+        public ValidatingCommand(T command, IValidator<T> validator)
+            : base(command)
+        {
+            _validator = validator;
+        }
+
+        public override bool TryGetMember(GetMemberBinder binder, out object result)
+        {
+            var ex = Expression.Property(Expression.Constant(InnerCommand), binder.Name);
+            result = Expression.Lambda(ex).Compile().DynamicInvoke();
+            return true;
+        }
+
+        public override bool TrySetMember(SetMemberBinder binder, object value)
+        {
+            var method = InnerCommand.GetType().GetProperty(binder.Name).GetSetMethod();
+            method.Invoke(InnerCommand, new[] { value });
+
+            return true;
+        }
+
+        /// <summary>
+        /// Validates the command
+        /// </summary>
+        public virtual ValidationResult Validate()
+        {
+            return _validator.Validate(InnerCommand);
+        }
+
+        public string this[string columnName]
+        {
+            get
+            {
+                var validationResults = Validate();
+
+                if (validationResults == null) return string.Empty;
+
+                var columnResults = validationResults.Errors.FirstOrDefault(x => string.Compare(x.PropertyName, columnName, true) == 0);
+
+                return columnResults != null ? columnResults.ErrorMessage : string.Empty;
+            }
+        }
+
+        public string Error
+        {
+            get
+            {
+                var message = new StringBuilder();
+
+                foreach (var validationFailure in Validate().Errors)
+                {
+                    message.Append(validationFailure.ErrorMessage);
+                    message.Append(Environment.NewLine);
+                }
+
+                return message.ToString();
+            }
+        }
+    }
+}
\ No newline at end of file
diff --git a/CQRSSample.WpfClient/CQRSSample.WpfClient.csproj b/CQRSSample.WpfClient/CQRSSample.WpfClient.csproj
index cc3f850..53b3b6d 100644
--- a/CQRSSample.WpfClient/CQRSSample.WpfClient.csproj
+++ b/CQRSSample.WpfClient/CQRSSample.WpfClient.csproj
@@ -84,6 +84,8 @@
       <SubType>Code</SubType>
     </Compile>
     <Compile Include="ApplicationFramework\Converters\CollapsedWhenNullConverter.cs" />
+    <Compile Include="ApplicationFramework\ScreenWithValidatingCommand.cs" />
+    <Compile Include="ApplicationFramework\ValidatingCommand.cs" />
     <Compile Include="Infrastructure\Installers\ViewModelInstaller.cs" />
     <Compile Include="Modules\CustomerDetails\CreateCustomer\CreateCustomerView.xaml.cs">
       <DependentUpon>CreateCustomerView.xaml</DependentUpon>
@@ -222,6 +224,10 @@
   <ItemGroup>
     <Resource Include="ApplicationFramework\Icons\customers.png" />
   </ItemGroup>
+  <ItemGroup>
+    <Resource Include="ApplicationFramework\Icons\customer.png" />
+    <Resource Include="ApplicationFramework\Icons\no.png" />
+  </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/CQRSSample.WpfClient/Modules/CustomerDetails/CustomerRelocating/CustomerRelocatingView.xaml b/CQRSSample.WpfClient/Modules/CustomerDetails/CustomerRelocating/CustomerRelocatingView.xaml
index 4fdb3a7..6908c79 100644
--- a/CQRSSample.WpfClient/Modules/CustomerDetails/CustomerRelocating/CustomerRelocatingView.xaml
+++ b/CQRSSample.WpfClient/Modules/CustomerDetails/CustomerRelocating/CustomerRelocatingView.xaml
@@ -20,7 +20,7 @@
         </StackPanel>
         <StackPanel Orientation="Horizontal" Margin="10">
             <TextBlock Margin="0 0 10 0">City:</TextBlock>
-            <TextBox Text="{Binding Command.City, ValidatesOnDataErrors=True, ValidatesOnExceptions=True, UpdateSourceTrigger=PropertyChanged}" Style="{DynamicResource ValidatingTextBox}" Width="400" />
+            <TextBox Text="{Binding Command.City, ValidatesOnDataErrors=True, ValidatesOnExceptions=True}" Width="400" />
         </StackPanel>
         
         <Button x:Name="Save" Width="100" Margin="0 10 0 0">Save</Button>
diff --git a/CQRSSample.WpfClient/Modules/CustomerDetails/CustomerRelocating/CustomerRelocatingViewModel.cs b/CQRSSample.WpfClient/Modules/CustomerDetails/CustomerRelocating/CustomerRelocatingViewModel.cs
index a49d8e2..d3235bc 100644
--- a/CQRSSample.WpfClient/Modules/CustomerDetails/CustomerRelocating/CustomerRelocatingViewModel.cs
+++ b/CQRSSample.WpfClient/Modules/CustomerDetails/CustomerRelocating/CustomerRelocatingViewModel.cs
@@ -1,20 +1,13 @@
 using System;
-using System.ComponentModel;
-using System.Dynamic;
-using System.Linq;
-using System.Linq.Expressions;
-using System.Reflection;
-using System.Text;
 using Caliburn.Micro;
 using CQRSSample.Commands;
 using CQRSSample.Infrastructure;
 using CQRSSample.ReadModel;
-using FluentValidation;
-using FluentValidation.Results;
+using CQRSSample.WpfClient.ApplicationFramework;
 
 namespace CQRSSample.WpfClient.Modules.CustomerDetails.CustomerRelocating
 {
-    public class CustomerRelocatingViewModel : ValidatingScreenWithCommand<RelocatingCustomerCommand>
+    public class CustomerRelocatingViewModel : ScreenWithValidatingCommand<RelocatingCustomerCommand>
     {
         private readonly IBus _bus;
         private readonly IEventAggregator _eventAggregator;
@@ -39,7 +32,6 @@ public void WithCustomer(Guid customerId)
 
         public void Save()
         {
-            //TODO: Validation
             if(!Validate().IsValid)
                 return;
 
@@ -51,133 +43,6 @@ public void Save()
         }
     }
 
-    public class RelocatingCustomerValidator : AbstractValidator<RelocatingCustomerCommand>
-    {
-        public RelocatingCustomerValidator()
-        {
-            RuleFor(command => command.City).NotEmpty().NotNull();
-        }
-    }
-
-    public class ValidatingCommand<T> : DynamicObject, IDataErrorInfo where T : Command
-    {
-        private readonly dynamic _innerCommand;
-
-        public ValidatingCommand(T command, IValidator<T> validator)
-        {
-            _innerCommand = command;
-            Validator = validator;
-        }
-
-        public T InnerCommand{ get { return _innerCommand; }}
-
-        public override bool TryGetMember(GetMemberBinder binder, out object result)
-        {
-            var ex = Expression.Property(Expression.Constant(InnerCommand), binder.Name);
-            result = Expression.Lambda(ex).Compile().DynamicInvoke();
-            return true;
-        }
-
-        public override bool TrySetMember(SetMemberBinder binder, object value)
-        {
-            var method = InnerCommand.GetType().GetProperty(binder.Name).GetSetMethod(); 
-            //var setter = (Action<Command, object>)Delegate.CreateDelegate(typeof(Action<Command, object>), method);
-            method.Invoke(InnerCommand, new[]{value} );
-
-            //setter(InnerCommand, value);
-            return true;
-        }
-
-        public IValidator<T> Validator { get; private set; }
-
-        /// <summary>
-        /// Validates the command
-        /// </summary>
-        public virtual ValidationResult Validate()
-        {
-            return Validator.Validate(InnerCommand);
-        }
-
-        public string this[string columnName]
-        {
-            get
-            {
-                var validationResults = Validate();
-
-                if (validationResults == null) return string.Empty;
-
-                var columnResults = validationResults.Errors.FirstOrDefault(x => string.Compare(x.PropertyName, columnName, true) == 0);
-
-                return columnResults != null ? columnResults.ErrorMessage : string.Empty;
-            }
-        }
-
-        public string Error
-        {
-            get
-            {
-                var message = new StringBuilder();
-
-                foreach (var validationFailure in Validate().Errors)
-                {
-                    message.Append(validationFailure.ErrorMessage);
-                    message.Append(Environment.NewLine);
-                }
-
-                return message.ToString();
-            }
-        }
-    }
-
-    public class ValidatingScreenWithCommand<T> : Screen, IDataErrorInfo where T : Command
-    {
-        public ValidatingScreenWithCommand()
-        {
-            var c = new RelocatingCustomerCommand(Guid.NewGuid());
-        }
-
-        public ValidatingCommand<T> Command { get; protected set; }
-
-        public IValidator<T> Validator { get; set; }
-
-        /// <summary>
-        /// Validates the command
-        /// </summary>
-        protected virtual ValidationResult Validate()
-        {
-            return Command.Validate();
-        }
-
-        public string this[string columnName]
-        {
-            get
-            {
-                var validationResults = Validate();
-
-                if (validationResults == null) return string.Empty;
-
-                var columnResults = validationResults.Errors.FirstOrDefault(x => string.Compare(x.PropertyName, columnName, true) == 0);
-
-                return columnResults != null ? columnResults.ErrorMessage : string.Empty;
-            }
-        }
-
-        public string Error
-        {
-            get
-            {
-                var message = new StringBuilder();
-
-                foreach (var validationFailure in Validate().Errors)
-                {
-                    message.Append(validationFailure.ErrorMessage);
-                    message.Append(Environment.NewLine);
-                }
-
-                return message.ToString();
-            }
-        }
-    }
 
     public class CustomerRelocatingSavedEvent
     {
diff --git a/CQRSSample.WpfClient/Modules/Shell/ShellView.xaml b/CQRSSample.WpfClient/Modules/Shell/ShellView.xaml
index 0dedc6b..0baa3a4 100644
--- a/CQRSSample.WpfClient/Modules/Shell/ShellView.xaml
+++ b/CQRSSample.WpfClient/Modules/Shell/ShellView.xaml
@@ -21,7 +21,7 @@
                     <ribbon:RibbonButton x:Name="SearchCustomer" LargeImageSource="..\..\ApplicationFramework\Icons\customers.png" Label="Customer search" />
                 </ribbon:RibbonGroup>
                 <ribbon:RibbonGroup Header="Customer Details">
-                    <ribbon:RibbonButton x:Name="AddNewCustomer" LargeImageSource="..\..\ApplicationFramework\Icons\customers.png" Label="Add new customer" />
+                    <ribbon:RibbonButton x:Name="AddNewCustomer" LargeImageSource="..\..\ApplicationFramework\Icons\customer.png" Label="Add new customer" />
                 </ribbon:RibbonGroup>
             </ribbon:RibbonTab>
 
diff --git a/CQRSSample.WpfClient/Themes/ExpressionDark.xaml b/CQRSSample.WpfClient/Themes/ExpressionDark.xaml
index bbfc523..80548c6 100644
--- a/CQRSSample.WpfClient/Themes/ExpressionDark.xaml
+++ b/CQRSSample.WpfClient/Themes/ExpressionDark.xaml
@@ -1506,6 +1506,25 @@
         <Setter Property="Foreground" Value="{DynamicResource TextBrush}" />
         <Setter Property="Background" Value="{DynamicResource ControlBackgroundBrush}"/>
         <Setter Property="BorderBrush" Value="#FF000000"/>
+
+        <!--Validation-->
+        <Setter Property="Margin" Value="3" />
+        <Setter Property="Validation.ErrorTemplate">
+            <Setter.Value>
+                <ControlTemplate>
+                    <DockPanel DockPanel.Dock="Right" >
+                        <AdornedElementPlaceholder />
+                        <Image Source="/ApplicationFramework/Icons/no.png" Width="15" Height="15" ToolTip="{Binding Path=AdornedElement.ToolTip, RelativeSource={RelativeSource Mode=FindAncestor, AncestorType={x:Type Adorner}}}" />
+                    </DockPanel>
+                </ControlTemplate>
+            </Setter.Value>
+        </Setter>
+        <Style.Triggers>
+            <Trigger Property="Validation.HasError" Value="True">
+                <Setter Property="ToolTip" Value="{Binding RelativeSource={x:Static RelativeSource.Self}, 
+                        Path=(Validation.Errors)[0].ErrorContent}" />
+            </Trigger>
+        </Style.Triggers>
     </Style>
 
     <ControlTemplate x:Key="TextBoxTemplate" TargetType="{x:Type TextBox}">