--- a/Messaging/Server/UI/MainWindow.xaml	Thu Mar 22 08:42:03 2012 +0000
+++ b/Messaging/Server/UI/MainWindow.xaml	Tue Mar 27 16:15:45 2012 +0100
@@ -11,8 +11,11 @@
               MinWidth="700"
               MinHeight="475"
               DataContext="{Binding MainWindowViewModel,
-                                    Source={StaticResource Locator}}"
-              Icon="{StaticResource Mail}">
+                                    Source={StaticResource Locator}}">
+
+    <Window.Resources>
+        <Image x:Key="MailIcon" Source="mail.ico" />
+    </Window.Resources>
 
     <TabControl Margin="{Binding Source={x:Static metro:Parameters.Instance}, Path=BoldPadding, Mode=OneWay}">
         <TabItem Header="dashboard">
@@ -54,34 +57,37 @@
                               IsChecked="{Binding ZeroMqEndPoint.IsListening}"
                               IsEnabled="True" />
 
-                <c:MessageTile Grid.Row="1"
-                               Grid.Column="0"
-                               Background="{StaticResource MetroPurpleBrush}"
-                               DisplayCount="{Binding MsmqEndPoint.DisplayCount,
-                                                      Mode=TwoWay,
-                                                      UpdateSourceTrigger=PropertyChanged}"
-                               DisplayIcon="{StaticResource Mail}"
-                               DisplayText="{Binding MsmqEndPoint.DisplayText}"
-                               Foreground="White"
-                               ToolTip="{Binding MsmqEndPoint.ToolTip}" />
+                <c:MetroTile Grid.Row="1"
+                             Grid.Column="0"
+                             DisplayCount="{Binding MsmqEndPoint.DisplayCount}"
+                             DisplayIcon="{StaticResource Mail}"
+                             DisplayText="{Binding MsmqEndPoint.DisplayText}"
+                             Margin="10"
+                             Foreground="White"
+                             ToolTip="{Binding MsmqEndPoint.ToolTip}" />
+
 
-                <c:MessageTile Grid.Row="1"
-                               Grid.Column="1"
-                               Background="{StaticResource MetroGreenBrush}"
-                               DisplayCount="{Binding RabbitEndPoint.DisplayCount}"
-                               DisplayIcon="{StaticResource Mail}"
-                               DisplayText="{Binding RabbitEndPoint.DisplayText}"
-                               Foreground="White"
-                               ToolTip="{Binding RabbitEndPoint.ToolTip}" />
+                <c:MetroTile Grid.Row="1"
+                             Grid.Column="1"
+                             Margin="10"
+                             Background="{StaticResource MetroGreenBrush}"
+                             DisplayCount="{Binding RabbitEndPoint.DisplayCount}"
+                             DisplayIcon="{StaticResource Mail}"
+                             DisplayText="{Binding RabbitEndPoint.DisplayText}"
+                             Foreground="White"
+                             ToolTip="{Binding RabbitEndPoint.ToolTip}" />
 
-                <c:MessageTile Grid.Row="1"
-                               Grid.Column="2"
-                               Background="{StaticResource MetroOrangeBrush}"
-                               DisplayCount="{Binding ZeroMqEndPoint.DisplayCount}"
-                               DisplayIcon="{StaticResource Mail}"
-                               DisplayText="{Binding ZeroMqEndPoint.DisplayText}"
-                               Foreground="White"
-                               ToolTip="{Binding ZeroMqEndPoint.ToolTip}" />
+                <c:MetroTile Grid.Row="1"
+                             Grid.Column="2"
+                             Margin="10"
+                             Background="{StaticResource MetroOrangeBrush}"
+                             DisplayCount="{Binding ZeroMqEndPoint.DisplayCount}"
+                             DisplayIcon="{StaticResource Mail}"
+                             DisplayText="{Binding ZeroMqEndPoint.DisplayText}"
+                             Foreground="White"
+                             RenderTransformOrigin="0.5,0.5"
+                             ToolTip="{Binding ZeroMqEndPoint.ToolTip}" />
+
                 <ScrollViewer Grid.Row="2"
                               Grid.Column="0"
                               Xaml:XamlHelper.AutoScroll="{Binding MsmqEndPoint.IsLogChanged}">