diff --git a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.xaml b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.xaml
index beefdb3ff..7c9c5d7f2 100644
--- a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.xaml
+++ b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceEditorView.xaml
@@ -110,12 +110,9 @@
                         </ItemsControl.ItemContainerStyle>
                         <ItemsControl.ItemTemplate>
                             <DataTemplate>
-                                <ContentControl Width="{Binding Device.RgbDevice.Size.Width}"
-                                                Height="{Binding Device.RgbDevice.Size.Height}"
+                                <ContentControl Width="{Binding Device.RgbDevice.DeviceRectangle.Size.Width}"
+                                                Height="{Binding Device.RgbDevice.DeviceRectangle.Size.Height}"
                                                 s:View.Model="{Binding}">
-                                    <ContentControl.RenderTransform>
-                                        <RotateTransform Angle="{Binding Device.RgbDevice.Rotation.Degrees}" CenterX="{Binding RgbDeviceRectangle.Center.X}" CenterY="{Binding RgbDeviceRectangle.Center.Y}"></RotateTransform>
-                                    </ContentControl.RenderTransform>
                                     <ContentControl.ContextMenu>
                                         <ContextMenu>
                                             <MenuItem Header="Bring to Front" Command="{s:Action BringToFront}" CommandParameter="{Binding}">
diff --git a/src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceDeviceView.xaml b/src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceDeviceView.xaml
index 9c5bb2880..c4877edb5 100644
--- a/src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceDeviceView.xaml
+++ b/src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceDeviceView.xaml
@@ -19,6 +19,9 @@
         <converters:NullToVisibilityConverter x:Key="NullToVisibilityConverter" />
     </UserControl.Resources>
     <Grid>
+        <Grid.LayoutTransform>
+            <RotateTransform Angle="{Binding Device.RgbDevice.Rotation.Degrees}"></RotateTransform>
+        </Grid.LayoutTransform>
         <!-- Device image with fallback -->
         <Image Source="{Binding Device.RgbDevice.DeviceInfo.Image, Converter={StaticResource NullToImageConverter}}" />
 
diff --git a/src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceDeviceViewModel.cs b/src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceDeviceViewModel.cs
index 3d7d39b5d..b9878655e 100644
--- a/src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceDeviceViewModel.cs
+++ b/src/Artemis.UI/Screens/SurfaceEditor/Visualization/SurfaceDeviceViewModel.cs
@@ -32,8 +32,10 @@ namespace Artemis.UI.Screens.SurfaceEditor.Visualization
 
         private void DeviceOnDeviceUpdated(object sender, EventArgs e)
         {
-            NotifyOfPropertyChange(() => RgbDeviceRectangle);
-            NotifyOfPropertyChange(() => Device.RgbDevice);
+            NotifyOfPropertyChange(() => RgbDeviceRectangle);        
+            NotifyOfPropertyChange(() => RgbDeviceRectangle.Location.X);        
+            NotifyOfPropertyChange(() => RgbDeviceRectangle.Location.Y);     
+            
         }
 
         public Device Device { get; set; }