diff --git a/.mvn/maven.config b/.mvn/maven.config
new file mode 100644
index 0000000..51aef67
--- /dev/null
+++ b/.mvn/maven.config
@@ -0,0 +1 @@
+-P polarion2404
diff --git a/src/main/java/ch/sbb/polarion/extension/excel_importer/ExcelImporterNavigationExtender.java b/src/main/java/ch/sbb/polarion/extension/excel_importer/ExcelImporterNavigationExtender.java
index e47f7ce..a6bf0c5 100644
--- a/src/main/java/ch/sbb/polarion/extension/excel_importer/ExcelImporterNavigationExtender.java
+++ b/src/main/java/ch/sbb/polarion/extension/excel_importer/ExcelImporterNavigationExtender.java
@@ -28,7 +28,7 @@ public String getLabel() {
     @Nullable
     @Override
     public String getIconUrl() {
-        return "/polarion/icons/default/topicIcons/documentsAndWiki.svg";
+        return "/polarion/excel-importer-admin/ui/images/menu/30x30/_parent.svg";
     }
 
     @Nullable
diff --git a/src/main/resources/META-INF/hivemodule.xml b/src/main/resources/META-INF/hivemodule.xml
index 30b1bfa..dd35062 100644
--- a/src/main/resources/META-INF/hivemodule.xml
+++ b/src/main/resources/META-INF/hivemodule.xml
@@ -1,37 +1,44 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <module id="ch.sbb.polarion.extension.excel_importer" version="1.0.0">
+
     <contribution configuration-id="com.polarion.xray.webui.administrationPageExtenders">
-        <extender name="About"
+        <extender id="about"
+                  name="About"
+                  parentNodeId="excel-importer"
                   parentNodeName="Excel Importer"
-                  parentNodeIconUrl="/polarion/icons/default/topicIcons/documentsAndWiki.svg"
-                  iconUrl="/polarion/icons/default/topicIconsSmall/documentsAndWiki.svg"
-                  pageUrl="/polarion/excel-importer-admin/pages/about.jsp"
+                  parentNodeIconUrl="/polarion/excel-importer-admin/ui/images/menu/30x30/_parent.svg"
+                  iconUrl="/polarion/excel-importer-admin/ui/images/menu/16x16/about.svg"
+                  pageUrl="/polarion/excel-importer-admin/pages/about.jsp?scope=$scope$"
                   projectScope="true"
+                  projectGroupScope="false"
                   repositoryScope="true"/>
 
-        <extender name="REST API"
-                  parentNodeName="Excel Importer"
-                  parentNodeIconUrl="/polarion/icons/default/topicIcons/documentsAndWiki.svg"
-                  iconUrl="/polarion/icons/default/topicIconsSmall/documentsAndWiki.svg"
+        <extender id="rest-api"
+                  name="REST API"
+                  parentNodeId="excel-importer"
+                  iconUrl="/polarion/excel-importer-admin/ui/images/menu/16x16/rest_api.svg"
                   pageUrl="/polarion/excel-importer/rest/swagger"
                   projectScope="true"
+                  projectGroupScope="false"
                   repositoryScope="true"/>
 
-        <extender name="Mappings"
-                  parentNodeName="Excel Importer"
-                  parentNodeIconUrl="/polarion/icons/default/topicIcons/documentsAndWiki.svg"
-                  iconUrl="/polarion/icons/default/topicIconsSmall/documentsAndWiki.svg"
+        <extender id="mappings"
+                  name="Mappings"
+                  parentNodeId="excel-importer"
+                  iconUrl="/polarion/excel-importer-admin/ui/images/menu/16x16/mapping.svg"
                   pageUrl="/polarion/excel-importer-admin/pages/mappings.jsp?scope=$scope$"
                   projectScope="true"
-                  repositoryScope="false"/>
+                  projectGroupScope="false"
+                  repositoryScope="true"/>
 
-        <extender name="Import File"
-                  parentNodeName="Excel Importer"
-                  parentNodeIconUrl="/polarion/icons/default/topicIcons/documentsAndWiki.svg"
-                  iconUrl="/polarion/icons/default/topicIconsSmall/documentsAndWiki.svg"
+        <extender id="import-file"
+                  name="Import File"
+                  parentNodeId="excel-importer"
+                  iconUrl="/polarion/excel-importer-admin/ui/images/menu/16x16/import.svg"
                   pageUrl="/polarion/excel-importer-admin/pages/import_file.jsp?scope=$scope$"
                   projectScope="true"
-                  repositoryScope="false"/>
+                  projectGroupScope="false"
+                  repositoryScope="true"/>
     </contribution>
 
     <contribution configuration-id="com.polarion.xray.webui.customNavigationExtenders">
@@ -44,4 +51,4 @@
         </invoke-factory>
     </service-point>
 
-</module>
\ No newline at end of file
+</module>
diff --git a/src/main/resources/webapp/excel-importer-admin/images/menu/16x16/about.svg b/src/main/resources/webapp/excel-importer-admin/images/menu/16x16/about.svg
new file mode 100644
index 0000000..930c512
--- /dev/null
+++ b/src/main/resources/webapp/excel-importer-admin/images/menu/16x16/about.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><defs><style>.b{fill:#fff;}</style></defs><path class="b" d="M8,.5C3.86.5.5,3.86.5,8s3.36,7.5,7.5,7.5,7.5-3.36,7.5-7.5S12.14.5,8,.5ZM8,14.62c-3.65,0-6.62-2.97-6.62-6.62S4.35,1.38,8,1.38s6.62,2.97,6.62,6.62-2.97,6.62-6.62,6.62Z"/><circle class="b" cx="8" cy="4.35" r=".97"/><path class="b" d="M9.46,11.21h-.54v-4.43c0-.24-.2-.44-.44-.44h-1.95c-.24,0-.44.2-.44.44s.2.44.44.44h1.51v3.99h-1.51c-.24,0-.44.2-.44.44s.2.44.44.44h2.92c.24,0,.44-.2.44-.44s-.2-.44-.44-.44Z"/></svg>
diff --git a/src/main/resources/webapp/excel-importer-admin/images/menu/16x16/import.svg b/src/main/resources/webapp/excel-importer-admin/images/menu/16x16/import.svg
new file mode 100644
index 0000000..814c2e7
--- /dev/null
+++ b/src/main/resources/webapp/excel-importer-admin/images/menu/16x16/import.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewBox="0 0 16 16"><defs><style>.b{fill:#fff;}</style></defs><path class="b" d="M8,1.05c-.25,0-.45.2-.45.45v8.91l-1.23-1.23c-.18-.18-.46-.18-.64,0s-.18.46,0,.64l2,2s.02.01.03.02c.04.03.08.06.12.08.06.02.11.03.17.03s.12-.01.17-.03c.05-.02.08-.05.12-.08,0,0,.02,0,.03-.02l2-2c.18-.18.18-.46,0-.64s-.46-.18-.64,0l-1.23,1.23V1.5c0-.25-.2-.45-.45-.45Z"/><path class="b" d="M13.5,6.05h-3c-.25,0-.45.2-.45.45s.2.45.45.45h3c.3,0,.55.25.55.55v6c0,.3-.25.55-.55.55H2.5c-.3,0-.55-.25-.55-.55v-6c0-.3.25-.55.55-.55h3c.25,0,.45-.2.45-.45s-.2-.45-.45-.45h-3c-.8,0-1.45.65-1.45,1.45v6c0,.8.65,1.45,1.45,1.45h11c.8,0,1.45-.65,1.45-1.45v-6c0-.8-.65-1.45-1.45-1.45Z"/></svg>
diff --git a/src/main/resources/webapp/excel-importer-admin/images/menu/16x16/mapping.svg b/src/main/resources/webapp/excel-importer-admin/images/menu/16x16/mapping.svg
new file mode 100644
index 0000000..02c6b71
--- /dev/null
+++ b/src/main/resources/webapp/excel-importer-admin/images/menu/16x16/mapping.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" height="16" width="16" viewBox="0 0 16 16"><defs><style>.b{fill:#fff;}</style></defs><path class="b" d="M11.89,4.82h3.11c.25,0,.45-.2.45-.45V1.26c0-.25-.2-.45-.45-.45h-3.11c-.25,0-.45.2-.45.45v1.12s-.04-.01-.07-.01h-1.56s0,0,0,0c-.05,0-.09.01-.13.03-.01,0-.03,0-.04.01-.04.02-.07.04-.1.07-.01.01-.03.02-.04.03-.02.02-.03.05-.05.07-.02.03-.03.05-.05.08,0,0,0,0,0,.01l-.92,2.63-1.92-2.74s-.02-.02-.03-.03c-.02-.02-.04-.04-.07-.06-.02-.02-.04-.03-.07-.05-.03-.01-.05-.02-.08-.03-.03,0-.06-.02-.09-.02-.01,0-.02,0-.04,0h-1.56s-.05.01-.07.01v-1.12c0-.25-.2-.45-.45-.45H1c-.25,0-.45.2-.45.45v3.11c0,.25.2.45.45.45h3.11c.25,0,.45-.2.45-.45v-1.12s.04.01.07.01h1.32l2.15,3.08-.84,2.41-.71-1.01s-.02-.02-.03-.03c-.02-.02-.04-.04-.07-.06-.02-.02-.04-.03-.07-.05-.03-.01-.05-.02-.08-.03-.03,0-.06-.01-.09-.02-.01,0-.02,0-.04,0h-1.56s-.05.01-.07.01v-1.12c0-.25-.2-.45-.45-.45H1c-.25,0-.45.2-.45.45v3.11c0,.25.2.45.45.45h3.11c.25,0,.45-.2.45-.45v-1.12s.04.01.07.01h1.32l.94,1.35-1.03,2.94h-1.24s-.05.01-.07.01v-1.12c0-.25-.2-.45-.45-.45H1c-.25,0-.45.2-.45.45v3.11c0,.25.2.45.45.45h3.11c.25,0,.45-.2.45-.45v-1.12s.04.01.07.01h1.56c.09,0,.16-.03.23-.07.02,0,.03-.02.04-.03.06-.05.12-.11.14-.19,0,0,0,0,0,0l.92-2.63,1.92,2.74s.02.01.03.02c.03.04.07.07.11.09.02.01.03.02.05.03.06.03.12.05.19.05h1.56s.05-.01.07-.01v1.12c0,.25.2.45.45.45h3.11c.25,0,.45-.2.45-.45v-3.11c0-.25-.2-.45-.45-.45h-3.11c-.25,0-.45.2-.45.45v1.12s-.04-.01-.07-.01h-1.32l-2.15-3.08.84-2.41.71,1.01s.02.01.03.02c.03.04.07.07.11.09.02.01.03.02.05.03.06.03.12.05.19.05h1.56s.05-.01.07-.01v1.12c0,.25.2.45.45.45h3.11c.25,0,.45-.2.45-.45v-3.11c0-.25-.2-.45-.45-.45h-3.11c-.25,0-.45.2-.45.45v1.12s-.04-.01-.07-.01h-1.32l-.94-1.35,1.03-2.94h1.24s.05-.01.07-.01v1.12c0,.25.2.45.45.45ZM12.34,1.71h2.21v2.21h-2.21V1.71ZM3.66,3.92H1.45V1.71h2.21v2.21ZM3.66,9.11H1.45v-2.21h2.21v2.21ZM3.66,14.29H1.45v-2.21h2.21v2.21ZM12.34,12.08h2.21v2.21h-2.21v-2.21ZM12.34,6.89h2.21v2.21h-2.21v-2.21Z"/></svg>
diff --git a/src/main/resources/webapp/excel-importer-admin/images/menu/16x16/rest_api.svg b/src/main/resources/webapp/excel-importer-admin/images/menu/16x16/rest_api.svg
new file mode 100644
index 0000000..59d3877
--- /dev/null
+++ b/src/main/resources/webapp/excel-importer-admin/images/menu/16x16/rest_api.svg
@@ -0,0 +1 @@
+<?xml version="1.0" encoding="UTF-8"?><svg id="a" xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16"><defs><style>.b{fill:#fff;}</style></defs><circle class="b" cx="6.14" cy="8" r=".59"/><circle class="b" cx="8" cy="8" r=".59"/><path class="b" d="M10.45,8c0-.33-.27-.59-.59-.59s-.59.27-.59.59.27.59.59.59.59-.27.59-.59Z"/><path class="b" d="M13.01,7.55s0,0-.01,0h0c-.31.01-.74-.04-.94-.27-.19-.21-.17-.56-.1-1.11.07-.6.15-1.28-.33-1.81-.34-.39-.88-.57-1.63-.57v.9c.32-.02.75.04.95.27.19.22.17.56.1,1.11-.07.6-.15,1.28.33,1.81.04.04.09.08.14.12-.05.04-.1.07-.14.12-.48.53-.4,1.21-.33,1.81.06.54.09.89-.1,1.11-.2.23-.63.27-.94.27v.9h.04c.71,0,1.24-.19,1.57-.57.48-.53.4-1.21.33-1.81-.06-.54-.09-.89.1-1.11.2-.23.63-.27.94-.27h.01v-.45s0-.45,0-.45Z"/><path class="b" d="M5.04,11.03c-.19-.21-.17-.56-.1-1.11.07-.6.15-1.28-.33-1.81-.04-.04-.09-.08-.14-.12.05-.04.1-.07.14-.12.48-.53.4-1.21.33-1.81-.06-.55-.09-.89.1-1.11.2-.23.63-.27.94-.27v-.9c-.73,0-1.27.18-1.61.57-.48.53-.4,1.21-.33,1.81.06.54.09.89-.1,1.11-.2.23-.62.27-.94.27h0s0,0-.01,0v.45s0,.45,0,.45h.01c.32,0,.74.04.94.27.19.22.17.56.1,1.11-.07.6-.15,1.28.33,1.81.34.38.87.57,1.57.57h.05v-.9c-.32,0-.75-.04-.95-.27Z"/><path class="b" d="M8,.3C3.75.3.3,3.75.3,8s3.45,7.7,7.7,7.7,7.7-3.45,7.7-7.7S12.25.3,8,.3ZM8,14.8c-3.75,0-6.8-3.05-6.8-6.8S4.25,1.2,8,1.2s6.8,3.05,6.8,6.8-3.05,6.8-6.8,6.8Z"/></svg>
diff --git a/src/main/resources/webapp/excel-importer-admin/images/menu/30x30/_parent.svg b/src/main/resources/webapp/excel-importer-admin/images/menu/30x30/_parent.svg
new file mode 100644
index 0000000..651419e
--- /dev/null
+++ b/src/main/resources/webapp/excel-importer-admin/images/menu/30x30/_parent.svg
@@ -0,0 +1,24 @@
+<svg width="30" height="30" viewBox="0 0 80 80" fill="none" xmlns="http://www.w3.org/2000/svg">
+<g filter="url(#filter0_d_1482_209)">
+<mask id="mask0_1482_209" style="mask-type:luminance" maskUnits="userSpaceOnUse" x="4" y="2" width="72" height="72">
+<rect x="4" y="2" width="72" height="72" fill="white"/>
+</mask>
+<g mask="url(#mask0_1482_209)">
+<rect width="108" height="108" transform="translate(-14 -16)" fill="white"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M25.8511 31H25.0182L25.0177 31.8328L25 61.8328L24.9995 62.6667H25.8333H43.3333V61H26.6672L26.6839 32.6667H36.6667V41.837V42.6703H37.5H46.6667V44.3333H48.3333V41.8333V41.4919L48.0937 41.2486L38.2453 31.2486L38.0004 31H37.6515H25.8511ZM38.3333 41.0036V33.7133L45.5133 41.0036H38.3333ZM50.8333 45.6548L51.4226 46.2441L56.4226 51.2441L55.2441 52.4226L51.6667 48.8452V59.3406H50V48.8452L46.4226 52.4226L45.2441 51.2441L50.2441 46.2441L50.8333 45.6548ZM46.6662 61H55V62.6667H46.6662V61ZM32.4552 55.7068L34.3839 52.8458H32.9293L31.7249 54.7705L30.5345 52.8458H28.9999L30.9526 55.7068L28.8359 58.844H30.3344L31.6709 56.7592L32.9834 58.844H34.5599L32.4552 55.7068ZM44.8487 54.624H43.6002C43.5762 54.3318 43.4682 54.1078 43.2741 53.9517C43.082 53.7957 42.8099 53.7216 42.4638 53.7216C42.1537 53.7216 41.9136 53.7796 41.7436 53.9017C41.5715 54.0257 41.4875 54.1938 41.4875 54.4139C41.4875 54.6119 41.5695 54.752 41.7335 54.838C41.8916 54.9281 42.2958 55.0501 42.94 55.2102C43.6222 55.3782 44.0924 55.5503 44.3565 55.7224C44.8387 56.0385 45.0808 56.4806 45.0808 57.0468C45.0808 57.6671 44.8387 58.1572 44.3505 58.5154C43.9223 58.8335 43.3401 58.9895 42.6079 58.9895C41.7936 58.9895 41.1593 58.8015 40.7092 58.4293C40.257 58.0592 40.0229 57.527 40.0069 56.8428H41.3094C41.3294 57.1749 41.4154 57.421 41.5695 57.585C41.8096 57.8431 42.1717 57.9692 42.6559 57.9692C42.984 57.9692 43.2441 57.9071 43.4362 57.7771C43.6522 57.629 43.7603 57.429 43.7603 57.1749C43.7603 56.9208 43.6082 56.7347 43.3061 56.6167C43.1401 56.5507 42.7439 56.4326 42.1237 56.2605C41.7335 56.1525 41.4314 56.0505 41.2134 55.9564C40.9933 55.8584 40.8172 55.7524 40.6872 55.6363C40.3811 55.3622 40.227 54.9841 40.227 54.5019C40.227 53.9277 40.4671 53.4715 40.9473 53.1354C41.3534 52.8453 41.8836 52.7013 42.5338 52.7013C43.106 52.7013 43.5842 52.8153 43.9704 53.0414C44.5246 53.3695 44.8167 53.8937 44.8487 54.624ZM39.405 58.8445V57.7361H36.4699V52.8463H35.1614V58.8445H39.405Z" fill="black"/>
+<rect x="-14" y="-16" width="108" height="40" fill="#EB0000"/>
+<path fill-rule="evenodd" clip-rule="evenodd" d="M33.9901 19.4615H37.4863L32.7816 14.6731H38.6207V19.4615H41.3802V14.6731H47.2197L42.5137 19.4615H46.0102L52 13.2405L46.0102 7H42.5137L47.2197 11.8079H41.3802V7H38.6207V11.8079H32.7816L37.4863 7H33.9901L28 13.2405L33.9901 19.4615Z" fill="white"/>
+</g>
+</g>
+<defs>
+<filter id="filter0_d_1482_209" x="0" y="0" width="80" height="80" filterUnits="userSpaceOnUse" color-interpolation-filters="sRGB">
+<feFlood flood-opacity="0" result="BackgroundImageFix"/>
+<feColorMatrix in="SourceAlpha" type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 127 0" result="hardAlpha"/>
+<feOffset dy="2"/>
+<feGaussianBlur stdDeviation="2"/>
+<feColorMatrix type="matrix" values="0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0 0.2 0"/>
+<feBlend mode="normal" in2="BackgroundImageFix" result="effect1_dropShadow_1482_209"/>
+<feBlend mode="normal" in="SourceGraphic" in2="effect1_dropShadow_1482_209" result="shape"/>
+</filter>
+</defs>
+</svg>