diff --git a/NetworkDiagram/MainWindow.xaml b/NetworkDiagram/MainWindow.xaml
index 5b0bd16..83c8967 100644
--- a/NetworkDiagram/MainWindow.xaml
+++ b/NetworkDiagram/MainWindow.xaml
@@ -103,7 +103,7 @@
                         <Border x:Name="DeviceBorder" BorderBrush="Transparent" BorderThickness="2" CornerRadius="8" 
                                 Background="Transparent" Padding="8" MaxWidth="160">
                             <StackPanel>
-                                <Image Source="{Binding IconPath}" Width="56" Height="56" HorizontalAlignment="Center" RenderOptions.BitmapScalingMode="HighQuality">
+                                <Image Source="{Binding IconPath}" MaxWidth="64" MaxHeight="64" HorizontalAlignment="Center" RenderOptions.BitmapScalingMode="HighQuality">
                                     <Image.Style>
                                         <Style TargetType="Image">
                                             <Style.Triggers>
diff --git a/NetworkDiagram/MainWindow.xaml.cs b/NetworkDiagram/MainWindow.xaml.cs
index a9ceeab..44eab67 100644
--- a/NetworkDiagram/MainWindow.xaml.cs
+++ b/NetworkDiagram/MainWindow.xaml.cs
@@ -464,13 +464,13 @@ namespace NetworkDiagram
             if (!_deviceElements.TryGetValue(conn.StartDevice, out var startElem) ||
                 !_deviceElements.TryGetValue(conn.EndDevice, out var endElem)) return;
             
-            if (startElem.ActualWidth == 0) startElem.UpdateLayout();
-            if (endElem.ActualWidth == 0) endElem.UpdateLayout();
+            if (startElem.ActualWidth == 0 || startElem.ActualHeight == 0) startElem.UpdateLayout();
+            if (endElem.ActualWidth == 0 || endElem.ActualHeight == 0) endElem.UpdateLayout();
 
             line.X1 = conn.StartDevice.X + (startElem.ActualWidth / 2);
-            line.Y1 = conn.StartDevice.Y + 24;
+            line.Y1 = conn.StartDevice.Y + (startElem.ActualHeight / 2);
             line.X2 = conn.EndDevice.X + (endElem.ActualWidth / 2);
-            line.Y2 = conn.EndDevice.Y + 24;
+            line.Y2 = conn.EndDevice.Y + (endElem.ActualHeight / 2);
         }
 
         private void Window_KeyDown(object sender, KeyEventArgs e)