diff --git a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
index 2000b82..7c637bd 100644
--- a/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
+++ b/src/org/openstreetmap/josm/data/osm/visitor/paint/StyledMapRenderer.java
@@ -928,6 +928,7 @@ public class StyledMapRenderer extends AbstractMapRenderer {
             temporaryGraphics.setComposite(AlphaComposite.getInstance(AlphaComposite.SRC_OVER, alpha));
         }
 
+<<<<<<< Updated upstream
         double x = Math.round(p.getInViewX());
         double y = Math.round(p.getInViewY());
         temporaryGraphics.translate(x, y);
@@ -935,6 +936,13 @@ public class StyledMapRenderer extends AbstractMapRenderer {
         int drawX = -w/2 + img.offsetX;
         int drawY = -h/2 + img.offsetY;
         temporaryGraphics.drawImage(img.getImage(disabled), drawX, drawY, nc);
+=======
+        double x = p.getInViewX();
+        double y = p.getInViewY();
+        temporaryGraphics.translate(x, y);
+        temporaryGraphics.rotate(theta);
+        temporaryGraphics.drawImage(img.getImage(disabled), -w/2 + img.offsetX, -h/2 + img.offsetY, w, h, nc);
+>>>>>>> Stashed changes
         if (selected || member) {
             Color color;
             if (disabled) {
diff --git a/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java b/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java
index f7127f8..a9368d3 100644
--- a/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java
+++ b/test/unit/org/openstreetmap/josm/gui/layer/LayerTest.java
@@ -96,6 +96,19 @@ public class LayerTest {
     public void testSetName() {
         testLayer.setName("Test Layer2");
         assertEquals("Test Layer2", testLayer.getName());
+
+        testLayer = new LayerManagerTest.TestLayer() {
+            @Override
+            public AbstractProperty<Color> getColorProperty() {
+                return new ColorProperty("test", Color.RED);
+            }
+        };
+
+        testLayer.setName("Test Layer2");
+        testLayer.setName(null);
+        assertEquals("", testLayer.getName());
+        testLayer.setName("Test Layer3");
+        assertEquals("Test Layer3", testLayer.getName());
     }
 
     /**