diff -r de7ba61f66c7 -r 2482ddb44cb6 client/src/Iri.Modernisation.Controls/View/ClickMenu/ClickMenuItem.xaml
--- a/client/src/Iri.Modernisation.Controls/View/ClickMenu/ClickMenuItem.xaml	Mon Nov 23 10:17:33 2009 +0100
+++ b/client/src/Iri.Modernisation.Controls/View/ClickMenu/ClickMenuItem.xaml	Mon Nov 23 14:46:38 2009 +0100
@@ -1,48 +1,25 @@
-<ContentControl
+<UserControl
 	xmlns="http://schemas.microsoft.com/winfx/2006/xaml/presentation"
 	xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml"
 	xmlns:d="http://schemas.microsoft.com/expression/blend/2008"
 	xmlns:mc="http://schemas.openxmlformats.org/markup-compatibility/2006"
 	mc:Ignorable="d"
-	x:Class="Iri.Modernisation.Controls.View.ClickMenuItem" MouseEnter="MouseEnter" MouseLeftButtonUp="UserControl_MouseLeftButtonUp">
-	 <ContentControl.Template>
-
-	 <ControlTemplate>
 	
-      <Grid x:Name="RootElement">
-	    <ContentPresenter Canvas.ZIndex="10" 
-              HorizontalAlignment="Center" VerticalAlignment="Center"
-             />
-
-       <Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Name="path78339" Fill="#FFA1A1A1" Stroke="#FF000000" StrokeThickness="1.20303285" StrokeMiterLimit="4" StrokeDashOffset="0" StrokeLineJoin="Round" StrokeEndLineCap="Flat" Data="M 1131.5 228 L 1100.6059 237.52202 L 1082.0032 211.0825 L 1101.4001 185.21994 L 1131.9908 195.67554 L 1131.5 228 z" Stretch="Fill" RenderTransformOrigin="0.5,0.5" UseLayoutRounding="False" Height="27.969" VerticalAlignment="Top" HorizontalAlignment="Left" Width="27.053" Margin="1.3,0.882,0,0">
-		<Path.RenderTransform>
-			<TransformGroup>
-				<ScaleTransform/>
-				<SkewTransform/>
-				<RotateTransform Angle="89.162"/>
-				<TranslateTransform/>
-			</TransformGroup>
-		</Path.RenderTransform>
+	x:Class="Iri.Modernisation.Controls.View.ClickMenuItem" MouseEnter="MouseEnter" MouseLeftButtonUp="UserControl_MouseLeftButtonUp" Background="Transparent" RenderTransformOrigin="0.5,0.5">
 	
-	</Path>
-      </Grid>
-	  
-    </ControlTemplate>
-	</ContentControl.Template>
-
-
-	 <!--  <Grid>
-	<Image></Image>
-	<Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Name="path78339" Fill="#FFA1A1A1" Stroke="#FF000000" StrokeThickness="1.20303285" StrokeMiterLimit="4" StrokeDashOffset="0" StrokeLineJoin="Round" StrokeEndLineCap="Flat" Data="M 1131.5 228 L 1100.6059 237.52202 L 1082.0032 211.0825 L 1101.4001 185.21994 L 1131.9908 195.67554 L 1131.5 228 z" Stretch="Fill" RenderTransformOrigin="0.5,0.5" UseLayoutRounding="False" Height="27.969" VerticalAlignment="Top" HorizontalAlignment="Left" Width="27.053" Margin="1.3,0.882,0,0">
-		<Path.RenderTransform>
-			<TransformGroup>
-				<ScaleTransform/>
-				<SkewTransform/>
-				<RotateTransform Angle="89.162"/>
-				<TranslateTransform/>
-			</TransformGroup>
-		</Path.RenderTransform>
-	
-	</Path>
-</Grid> -->
-</ContentControl>
\ No newline at end of file
+	<Grid>  
+						
+						<Path xmlns:x="http://schemas.microsoft.com/winfx/2006/xaml" x:Name="path78339" Fill="#FFA1A1A1" Stroke="#FF000000" StrokeThickness="1.20303285" StrokeMiterLimit="4" StrokeDashOffset="0" StrokeLineJoin="Round" StrokeEndLineCap="Flat" Data="M 1131.5 228 L 1100.6059 237.52202 L 1082.0032 211.0825 L 1101.4001 185.21994 L 1131.9908 195.67554 L 1131.5 228 z" Stretch="Fill" RenderTransformOrigin="0.5,0.5" UseLayoutRounding="False" Height="27.969" VerticalAlignment="Top" HorizontalAlignment="Left" Width="27.053" Margin="-0.053,0,0,0">
+							<Path.RenderTransform>
+								<TransformGroup>
+									<ScaleTransform/>
+									<SkewTransform />
+									<RotateTransform Angle="89.433" />
+									<TranslateTransform/>
+								</TransformGroup>
+							</Path.RenderTransform>
+						
+						</Path>
+						<Image x:Name="imgItem" HorizontalAlignment="Left" Width="27" Height="28" VerticalAlignment="Top" Margin="0,2,0,0"/>
+					</Grid>
+					</UserControl>
\ No newline at end of file