--- a/Messaging/Server/UI/MainWindow.xaml	Tue Mar 27 16:15:45 2012 +0100
+++ b/Messaging/Server/UI/MainWindow.xaml	Tue Mar 27 18:33:44 2012 +0100
@@ -11,11 +11,9 @@
               MinWidth="700"
               MinHeight="475"
               DataContext="{Binding MainWindowViewModel,
-                                    Source={StaticResource Locator}}">
+                                    Source={StaticResource Locator}}"
+              Icon="mail.ico">
 
-    <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">
@@ -59,11 +57,10 @@
 
                 <c:MetroTile Grid.Row="1"
                              Grid.Column="0"
+                             Margin="10"
                              DisplayCount="{Binding MsmqEndPoint.DisplayCount}"
-                             DisplayIcon="{StaticResource Mail}"
+                             DisplayIcon="mail.ico"
                              DisplayText="{Binding MsmqEndPoint.DisplayText}"
-                             Margin="10"
-                             Foreground="White"
                              ToolTip="{Binding MsmqEndPoint.ToolTip}" />
 
 
@@ -72,9 +69,8 @@
                              Margin="10"
                              Background="{StaticResource MetroGreenBrush}"
                              DisplayCount="{Binding RabbitEndPoint.DisplayCount}"
-                             DisplayIcon="{StaticResource Mail}"
+                             DisplayIcon="mail.ico"
                              DisplayText="{Binding RabbitEndPoint.DisplayText}"
-                             Foreground="White"
                              ToolTip="{Binding RabbitEndPoint.ToolTip}" />
 
                 <c:MetroTile Grid.Row="1"
@@ -82,10 +78,8 @@
                              Margin="10"
                              Background="{StaticResource MetroOrangeBrush}"
                              DisplayCount="{Binding ZeroMqEndPoint.DisplayCount}"
-                             DisplayIcon="{StaticResource Mail}"
+                             DisplayIcon="mail.ico"
                              DisplayText="{Binding ZeroMqEndPoint.DisplayText}"
-                             Foreground="White"
-                             RenderTransformOrigin="0.5,0.5"
                              ToolTip="{Binding ZeroMqEndPoint.ToolTip}" />
 
                 <ScrollViewer Grid.Row="2"