diff --git a/src/Artemis.UI.Shared/Controls/DeviceVisualizer.cs b/src/Artemis.UI.Shared/Controls/DeviceVisualizer.cs
index 8541d98a6..3d8a3192e 100644
--- a/src/Artemis.UI.Shared/Controls/DeviceVisualizer.cs
+++ b/src/Artemis.UI.Shared/Controls/DeviceVisualizer.cs
@@ -41,7 +41,6 @@ public class DeviceVisualizer : Control
         PropertyChanged += OnPropertyChanged;
     }
 
-
     /// <inheritdoc />
     public override void Render(DrawingContext drawingContext)
     {
@@ -305,8 +304,9 @@ public class DeviceVisualizer : Control
 
                 using DrawingContext context = renderTargetBitmap.CreateDrawingContext();
                 using Bitmap bitmap = new(device.Layout.Image.LocalPath);
+                using Bitmap scaledBitmap = bitmap.CreateScaledBitmap(renderTargetBitmap.PixelSize);
                 
-                context.DrawImage(bitmap, new Rect(bitmap.Size), new Rect(renderTargetBitmap.Size));
+                context.DrawImage(scaledBitmap, new Rect(scaledBitmap.Size));
                 lock (_deviceVisualizerLeds)
                 {
                     foreach (DeviceVisualizerLed deviceVisualizerLed in _deviceVisualizerLeds)
diff --git a/src/Artemis.UI.Shared/Controls/DeviceVisualizerLed.cs b/src/Artemis.UI.Shared/Controls/DeviceVisualizerLed.cs
index 29e219fb9..6c69cc674 100644
--- a/src/Artemis.UI.Shared/Controls/DeviceVisualizerLed.cs
+++ b/src/Artemis.UI.Shared/Controls/DeviceVisualizerLed.cs
@@ -46,10 +46,10 @@ internal class DeviceVisualizerLed
         try
         {
             using Bitmap bitmap = new(Led.Layout.Image.LocalPath);
+            using Bitmap scaledBitmap = bitmap.CreateScaledBitmap(new PixelSize((Led.RgbLed.Size.Width * scale).RoundToInt(), (Led.RgbLed.Size.Height * scale).RoundToInt()));
             drawingContext.DrawImage(
-                bitmap,
-                new Rect(bitmap.Size),
-                new Rect(Led.RgbLed.Location.X * scale, Led.RgbLed.Location.Y * scale, Led.RgbLed.Size.Width * scale, Led.RgbLed.Size.Height * scale)
+                scaledBitmap,
+                new Rect(Led.RgbLed.Location.X * scale, Led.RgbLed.Location.Y * scale, scaledBitmap.Size.Width, scaledBitmap.Size.Height)
             );
         }
         catch
diff --git a/src/Artemis.UI/Screens/Device/DeviceSettingsView.axaml b/src/Artemis.UI/Screens/Device/DeviceSettingsView.axaml
index 6c6330055..080b36def 100644
--- a/src/Artemis.UI/Screens/Device/DeviceSettingsView.axaml
+++ b/src/Artemis.UI/Screens/Device/DeviceSettingsView.axaml
@@ -11,13 +11,14 @@
              x:Class="Artemis.UI.Screens.Device.DeviceSettingsView">
     <Border Classes="card" Padding="0" Width="200" ClipToBounds="True" Margin="5">
         <Grid RowDefinitions="140,*,Auto">
-            <Rectangle Grid.Row="0" Fill="{DynamicResource CheckerboardBrush}"/>
-            <shared:DeviceVisualizer VerticalAlignment="Center"
+            <Rectangle Grid.Row="0" Fill="{DynamicResource CheckerboardBrush}" />
+            <shared:DeviceVisualizer Grid.Row="0"
+                                     VerticalAlignment="Center"
                                      HorizontalAlignment="Center"
                                      Margin="5"
                                      ShowColors="False"
                                      Device="{CompiledBinding Device}"
-                                     Grid.Row="0" />
+                                     RenderOptions.BitmapInterpolationMode="HighQuality" />
             <Button Grid.Row="0"
                     Classes="icon-button icon-button-large"
                     VerticalAlignment="Bottom"
@@ -38,22 +39,22 @@
             <Grid Grid.Row="2" Margin="10" ColumnDefinitions="25,*">
                 <CheckBox IsChecked="{CompiledBinding IsDeviceEnabled}" />
 
-				<SplitButton Grid.Column="1" Content="Properties" Command="{CompiledBinding ViewProperties}" HorizontalAlignment="Right">
-					<SplitButton.Flyout>
-						<MenuFlyout Placement="Bottom">
-							<MenuItem Header="Open plugin directory" Command="{CompiledBinding OpenPluginDirectory}">
-								<MenuItem.Icon>
-									<avalonia:MaterialIcon Kind="FolderOpen" />
-								</MenuItem.Icon>
-							</MenuItem>
-							<MenuItem Header="Identity input" Command="{CompiledBinding DetectInput}">
-								<MenuItem.Icon>
-									<avalonia:MaterialIcon Kind="GestureDoubleTap" />
-								</MenuItem.Icon>
-							</MenuItem>
+                <SplitButton Grid.Column="1" Content="Properties" Command="{CompiledBinding ViewProperties}" HorizontalAlignment="Right">
+                    <SplitButton.Flyout>
+                        <MenuFlyout Placement="Bottom">
+                            <MenuItem Header="Open plugin directory" Command="{CompiledBinding OpenPluginDirectory}">
+                                <MenuItem.Icon>
+                                    <avalonia:MaterialIcon Kind="FolderOpen" />
+                                </MenuItem.Icon>
+                            </MenuItem>
+                            <MenuItem Header="Identity input" Command="{CompiledBinding DetectInput}">
+                                <MenuItem.Icon>
+                                    <avalonia:MaterialIcon Kind="GestureDoubleTap" />
+                                </MenuItem.Icon>
+                            </MenuItem>
                         </MenuFlyout>
-					</SplitButton.Flyout>
-				</SplitButton>
+                    </SplitButton.Flyout>
+                </SplitButton>
             </Grid>
         </Grid>
     </Border>
diff --git a/src/Artemis.UI/Screens/Root/SplashView.axaml b/src/Artemis.UI/Screens/Root/SplashView.axaml
index 8fc7b8753..42e341abd 100644
--- a/src/Artemis.UI/Screens/Root/SplashView.axaml
+++ b/src/Artemis.UI/Screens/Root/SplashView.axaml
@@ -15,7 +15,7 @@
         ExtendClientAreaToDecorationsHint="True"
         ExtendClientAreaTitleBarHeightHint="450">
     <Grid RowDefinitions="250,50,Auto,*" IsHitTestVisible="False">
-        <Image Grid.Column="0" Stretch="Uniform" Width="200" Height="150" Source="/Assets/Images/Logo/bow.png" VerticalAlignment="Bottom"/>
+        <Image Grid.Column="0" Stretch="Uniform" Width="200" Height="150" Source="/Assets/Images/Logo/bow.png" VerticalAlignment="Bottom" RenderOptions.BitmapInterpolationMode="HighQuality"/>
         <TextBlock Grid.Row="1"
                    Classes="h5"
                    HorizontalAlignment="Center" 
diff --git a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceView.axaml b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceView.axaml
index 7c4cd14b1..f78825119 100644
--- a/src/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceView.axaml
+++ b/src/Artemis.UI/Screens/SurfaceEditor/SurfaceDeviceView.axaml
@@ -27,7 +27,7 @@
             </Style>
         </Grid.Styles>
 
-        <shared:DeviceVisualizer Device="{CompiledBinding Device}" ShowColors="True" />
+        <shared:DeviceVisualizer Device="{CompiledBinding Device}" ShowColors="True" RenderOptions.BitmapInterpolationMode="HighQuality"/>
         <Border x:Name="SurfaceDeviceBorder"
                 Classes="selection-border"
                 Classes.selected="{CompiledBinding IsSelected}"