diff --git a/_shared_assets/themes/nextcloud_com/static/styles.css b/_shared_assets/themes/nextcloud_com/static/styles.css
index b9665346b..408ccee6d 100644
--- a/_shared_assets/themes/nextcloud_com/static/styles.css
+++ b/_shared_assets/themes/nextcloud_com/static/styles.css
@@ -1081,3 +1081,53 @@ h4:hover a.headerlink {
 a.headerlink {
     display: none;
 }
+
+#menu-support {
+    padding-left: 0;
+    color: #428bca;
+}
+#menu-support > ul {
+    padding-left: 0;
+    list-style-type: none;
+}
+
+#menu-support > ul > li {
+    padding: 5px 9px;
+    padding-right: 0;
+}
+
+#menu-support > ul > li:nth-child(odd) {
+    border-top: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+}
+
+#menu-support > ul > li:last-child {
+    border-bottom: 0;
+}
+
+#menu-support > ul > .current {
+    border: 1px solid #999 !important;
+    border-right: 0 !important;
+    border-bottom-left-radius: 5px;
+    border-top-left-radius: 5px;
+}
+
+#menu-support > ul > .current + li{
+    border-top: 0;
+}
+#menu-support ul ul {
+    padding-left: 27px;
+}
+/* round bullets for the second level entries */
+#menu-support.menu ul ul {
+  list-style-type: disc;
+}
+/* square bullets for the third level entries */
+#menu-support.menu ul ul ul {
+  list-style-type: square;
+}
+/* having a separator between each elements of the top list and
+   between above the top of the third level list */
+#menu-support.menu ul ul ul {
+  border-top: 1px solid #EFEFEF;
+}
\ No newline at end of file
diff --git a/_shared_assets/themes/nextcloud_release/static/styles.css b/_shared_assets/themes/nextcloud_release/static/styles.css
index b86a130ef..f7dac96ce 100644
--- a/_shared_assets/themes/nextcloud_release/static/styles.css
+++ b/_shared_assets/themes/nextcloud_release/static/styles.css
@@ -314,12 +314,6 @@ ul#menu-support.menu > ul > li,
 ul#menu-support.menu ul ul ul {
   border-top: 1px solid #EFEFEF;
 }
-/* highlight the current list entry of the first list with white
-   font on blue background */
-ul#menu-support.menu > ul > li.current {
-  background-color: #428BCA;
-  color: white;
-}
 /* set to default padding for the sublist of the current entry */
 ul#menu-support.menu ul > li.current > ul {
   padding-left: 20px;
@@ -339,19 +333,41 @@ ul#menu-support.menu > ul li.toctree-l1 {
 ul#menu-support.menu > ul li.toctree-l1.current {
   padding-bottom: 10px;
 }
-/* override the color of links */
-ul#menu-support.menu ul > li.current > a:hover,
-ul#menu-support.menu ul > li.current > a:focus,
-ul#menu-support.menu ul > li.current > a {
-  color: white;
+
+#menu-support {
+    padding-left: 0;
 }
-/* override the color of the current link */
-ul#menu-support.menu ul > li.current > a.current {
-  color: #428BCA;
+#menu-support > ul {
+    padding-left: 0;
+    list-style-type: none;
 }
-/* override the color of the current link in the first level */
-ul#menu-support.menu > ul > li.current > a.current {
-  color: white;
+
+#menu-support > ul > li {
+    padding: 5px 9px;
+    padding-right: 0;
+}
+
+#menu-support > ul > li:nth-child(odd) {
+    border-top: 1px solid #ccc;
+    border-bottom: 1px solid #ccc;
+}
+
+#menu-support > ul > li:last-child {
+    border-bottom: 0;
+}
+
+#menu-support > ul > .current {
+    border: 1px solid #999 !important;
+    border-right: 0 !important;
+    border-bottom-left-radius: 5px;
+    border-top-left-radius: 5px;
+}
+
+#menu-support > ul > .current + li{
+    border-top: 0;
+}
+#menu-support ul ul {
+    padding-left: 27px;
 }
 
 .headerlink {