diff --git a/CHANGELOG.md b/CHANGELOG.md
index ece4261c5626617dbbc1bf567b08f7203fecdf62..8263e58c6415bb39623c77d76bb9cb7a1f7a2ed3 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -1,5 +1,6 @@
 Upcoming version:
 -----------------
+  - fixing some issues related to StyleIsoNodes in geoserver (Nikolaus Krismer)
   - merged (Nikolaus Krismer)
   - version upgrade of apache-tomcat (Nikolaus Krismer)
   - version upgrade of apache-tomcat (Nikolaus Krismer)
diff --git a/conf/geoserver_style_coverage.sld b/conf/geoserver_style_coverage.sld
index a7f1e61671e63da55b93cc1767ea8d1ef264f99f..4734c2152eae9fb08b5c8a35ae96ae0b7c2b3dfa 100644
--- a/conf/geoserver_style_coverage.sld
+++ b/conf/geoserver_style_coverage.sld
@@ -22,7 +22,6 @@
             </Stroke>
           </PolygonSymbolizer>
         </Rule>
-
       </FeatureTypeStyle>
     </UserStyle>
   </NamedLayer>
diff --git a/conf/geoserver_style_edge_expiration.sld b/conf/geoserver_style_edge_expiration.sld
index 3f6b6991049ce2c82a1b2b9b5875623499322efa..b828b6291575f638c0c2942c77bc51e780808741 100644
--- a/conf/geoserver_style_edge_expiration.sld
+++ b/conf/geoserver_style_edge_expiration.sld
@@ -18,7 +18,7 @@
         <Rule>
           <Name>rule1</Name>
           <Title>Blue Line</Title>
-          <Abstract>A solid blue line with a 1 pixel width</Abstract>
+          <Abstract>A solid grey line with a 1 pixel width</Abstract>
           <LineSymbolizer>
             <Stroke>
               <CssParameter name="stroke">#918C8E</CssParameter>
diff --git a/conf/geoserver_style_node.sld b/conf/geoserver_style_node.sld
index 96da202a401bd326b9a9312d95164cc57ce4c5d7..b9df6f161ff0084589f4cdf639fc6e3280ecfe8e 100644
--- a/conf/geoserver_style_node.sld
+++ b/conf/geoserver_style_node.sld
@@ -19,7 +19,7 @@
           <PointSymbolizer>
             <Graphic>
               <ExternalGraphic>
-                <OnlineResource xlink:type="simple" xlink:href="file:///setup/img/question.png" />
+                <OnlineResource xlink:type="simple" xlink:href="file:///setup/img/other.png" />
                 <Format>image/png</Format>
               </ExternalGraphic>
               <Size>
diff --git a/img/ferry.png b/img/ship.png
similarity index 100%
rename from img/ferry.png
rename to img/ship.png
diff --git a/img/ferry.xcf b/img/ship.xcf
similarity index 100%
rename from img/ferry.xcf
rename to img/ship.xcf