diff --git a/Subsurface/Content/Map/StructurePrefabs.xml b/Subsurface/Content/Map/StructurePrefabs.xml
index c34bb78f2..b17970684 100644
--- a/Subsurface/Content/Map/StructurePrefabs.xml
+++ b/Subsurface/Content/Map/StructurePrefabs.xml
@@ -109,23 +109,23 @@
   </CableHolderVertical>
 
   <topwindow width="128" height="49" body="true" health="100">
-    <sprite texture="Content/Map/testroom.png" sourcerect="208,880,128,48" depth ="0.05"/>
-    <backgroundsprite texture="Content/Map/testroom.png" sourcerect="344,880,128,48" depth ="0.85"/>    
+    <sprite texture="Content/Map/testroom.png" sourcerect="208,848,128,80" depth ="0.05"/>
+    <backgroundsprite texture="Content/Map/testroom.png" sourcerect="344,848,128,80" depth ="0.85"/>    
   </topwindow>
 
   <verticalwindow width="128" height ="224" body="true" health="100">
-    <sprite texture="Content/Map/testroom.png" sourcerect="368,576,128,224" depth ="0.05"/>
-    <backgroundsprite texture="Content/Map/testroom.png" sourcerect="239,576,128,224" depth ="0.85"/>    
+    <sprite texture="Content/Map/testroom.png" sourcerect="368,544,128,224" depth ="0.05"/>
+    <backgroundsprite texture="Content/Map/testroom.png" sourcerect="239,544,128,224" depth ="0.85"/>    
   </verticalwindow>
 
   <horizontalresizablewindow width="128" height ="64" body="true" health="100" resizehorizontal="true">
-    <sprite texture="Content/Map/testroom.png" sourcerect="207,803,128,64" depth ="0.06"/>
-    <backgroundsprite texture="Content/Map/testroom.png" sourcerect="337,803,128,64" depth ="0.06"/>    
+    <sprite texture="Content/Map/testroom.png" sourcerect="207,771,128,64" depth ="0.06"/>
+    <backgroundsprite texture="Content/Map/testroom.png" sourcerect="337,771,128,64" depth ="0.85"/>    
   </horizontalresizablewindow>
 
   <verticalresizablewindow width = "64" height ="128" body="true" health="100" resizevertical="true">
     <sprite texture="Content/Map/testroom.png" sourcerect="896,80,64,128" depth ="0.06"/>
-    <backgroundsprite texture="Content/Map/testroom.png" sourcerect="961,80,64,128" depth ="0.06"/>    
+    <backgroundsprite texture="Content/Map/testroom.png" sourcerect="961,80,64,128" depth ="0.85"/>    
   </verticalresizablewindow>
 
   <smallhorizontalback description="A decorative structure with no collision detection"
diff --git a/Subsurface/Content/Map/testroom.png b/Subsurface/Content/Map/testroom.png
index 6f00f0edb..76b1db675 100644
Binary files a/Subsurface/Content/Map/testroom.png and b/Subsurface/Content/Map/testroom.png differ
diff --git a/Subsurface/Source/Items/Components/Holdable/RepairTool.cs b/Subsurface/Source/Items/Components/Holdable/RepairTool.cs
index c08b5bca6..edb85ccd6 100644
--- a/Subsurface/Source/Items/Components/Holdable/RepairTool.cs
+++ b/Subsurface/Source/Items/Components/Holdable/RepairTool.cs
@@ -183,9 +183,15 @@ namespace Barotrauma.Items.Components
                 int sectionIndex = targetStructure.FindSectionIndex(ConvertUnits.ToDisplayUnits(pickedPosition));
                 if (sectionIndex < 0) return;
 
+                Vector2 progressBarPos = targetStructure.SectionPosition(sectionIndex);
+                if (targetStructure.Submarine != null)
+                {
+                    progressBarPos += targetStructure.Submarine.DrawPosition;
+                }
+
                 var progressBar = user.UpdateHUDProgressBar(
                     targetStructure,
-                    targetStructure.SectionPosition(sectionIndex) + targetStructure.Submarine.DrawPosition,
+                    progressBarPos,
                     1.0f - targetStructure.SectionDamage(sectionIndex) / targetStructure.Health,
                     Color.Red, Color.Green);
 
@@ -206,8 +212,6 @@ namespace Barotrauma.Items.Components
                         targetStructure.AddDamage(sectionIndex + i, -StructureFixAmount * degreeOfSuccess);
                     }
                 }
-
-
             }
             else if ((targetLimb = (targetBody.UserData as Limb)) != null)
             {