diff --git a/xdoc/plugin.jelly b/xdoc/plugin.jelly
index 5701e49b..f1c6d9b6 100644
--- a/xdoc/plugin.jelly
+++ b/xdoc/plugin.jelly
@@ -179,12 +179,7 @@
         @state - expanded / collapsed / none
         -->
       <a href="${pathTool.calculateLink(link,relativePath)}">
-        <j:if test="${state == 'expanded'}">
-          <img class="handle" src="${relativePath}/images/expanded.png" alt="Expanded"/>
-        </j:if>
-        <j:if test="${state == 'collapsed'}">
-          <img class="handle" src="${relativePath}/images/collapsed.png" alt="Expandable"/>
-        </j:if>
+        <img class="handle" src="${relativePath}/images/${state}.png" alt=""/>
         <j:if test="${empty(img)}">${name}</j:if>
         <j:if test="${!empty(img)}"><img style="border: 1px" src="${img}" title="${name}" alt="${name}"/></j:if>
        </a>
diff --git a/xdoc/src/plugin-resources/css/maven.css b/xdoc/src/plugin-resources/css/maven.css
index f3d53920..4d4be266 100644
--- a/xdoc/src/plugin-resources/css/maven.css
+++ b/xdoc/src/plugin-resources/css/maven.css
@@ -102,4 +102,9 @@ h3, h4 {
 img.handle {
  border: 0;
  padding-right: 2px;
+}
+
+#navcolumn div div  {
+ background-image: none;
+ background-repeat: no-repeat;
 }
\ No newline at end of file
diff --git a/xdoc/src/plugin-resources/images/none.png b/xdoc/src/plugin-resources/images/none.png
new file mode 100644
index 00000000..fef6d188
Binary files /dev/null and b/xdoc/src/plugin-resources/images/none.png differ