diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_true-header_none-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_true-header_none-secondary_button-editable_false.png
index 4f9712c754..0fb7889fe5 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_true-header_none-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_true-header_none-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_true-header_none-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_true-header_none-secondary_button-editable_true.png
index 0c4e00dff1..cc903d76c8 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_true-header_none-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_true-header_none-secondary_button-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_true-header_none-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_true-header_none-secondary_button-editable_false.png
index 55dbc7b7e0..1c98ff6de7 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_true-header_none-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_true-header_none-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_true-header_none-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_true-header_none-secondary_button-editable_true.png
index 4e8065112e..4ea67a36f6 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_true-header_none-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_true-header_none-secondary_button-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_true-header_none-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_true-header_none-secondary_button-editable_false.png
index a8ac5caacd..0ebd29c190 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_true-header_none-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_true-header_none-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_true-header_none-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_true-header_none-secondary_button-editable_true.png
index 3349e7ef44..1bf6d4ee24 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_true-header_none-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_true-header_none-secondary_button-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_image-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_image-secondary_button-editable_false.png
index f38120978f..be0a7e2539 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_image-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_image-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_image-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_image-secondary_button-editable_true.png
index 90881ed51c..a86872fe89 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_image-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_image-secondary_button-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_image-secondary_none-editable_false.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_image-secondary_none-editable_false.png
index 6cac7affc1..58273d67dc 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_image-secondary_none-editable_false.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_image-secondary_none-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_image-secondary_none-editable_true.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_image-secondary_none-editable_true.png
index 675966bd24..e343aa3913 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_image-secondary_none-editable_true.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_image-secondary_none-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_none-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_none-secondary_button-editable_false.png
index e6972a9693..64a9b02173 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_none-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_none-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_none-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_none-secondary_button-editable_true.png
index 57904f3902..ffe8fa2e6d 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_none-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_none-secondary_button-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_none-secondary_none-editable_false.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_none-secondary_none-editable_false.png
index 896ff1d85d..935af4231a 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_none-secondary_none-editable_false.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_none-secondary_none-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_none-secondary_none-editable_true.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_none-secondary_none-editable_true.png
index b63ea65b63..0917555f3f 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_none-secondary_none-editable_true.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_true-header_none-secondary_none-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_image-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_image-secondary_button-editable_false.png
index 849c46a7cf..a6e7dcd34f 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_image-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_image-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_image-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_image-secondary_button-editable_true.png
index 892f05bd05..bd3b352460 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_image-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_image-secondary_button-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_image-secondary_none-editable_false.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_image-secondary_none-editable_false.png
index 71ecf4651b..4123fcb0e0 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_image-secondary_none-editable_false.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_image-secondary_none-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_image-secondary_none-editable_true.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_image-secondary_none-editable_true.png
index 1ae9c1ce3f..4d91a47ad7 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_image-secondary_none-editable_true.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_image-secondary_none-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_none-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_none-secondary_button-editable_false.png
index 8e255e9bf3..84a9cf77a8 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_none-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_none-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_none-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_none-secondary_button-editable_true.png
index 0616d70c81..5a35dcedc3 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_none-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_none-secondary_button-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_none-secondary_none-editable_false.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_none-secondary_none-editable_false.png
index cf9a188aa8..01d39a8520 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_none-secondary_none-editable_false.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_none-secondary_none-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_none-secondary_none-editable_true.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_none-secondary_none-editable_true.png
index 4955bbf4e1..a66715bdcb 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_none-secondary_none-editable_true.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_true-header_none-secondary_none-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_image-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_image-secondary_button-editable_false.png
index ecf044f6a4..3aa382eb35 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_image-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_image-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_image-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_image-secondary_button-editable_true.png
index 227c5b5ec9..3bdc40ef32 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_image-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_image-secondary_button-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_image-secondary_none-editable_false.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_image-secondary_none-editable_false.png
index b99ad910ba..cbf541c63c 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_image-secondary_none-editable_false.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_image-secondary_none-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_image-secondary_none-editable_true.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_image-secondary_none-editable_true.png
index b1c1eb0da9..37225df4e6 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_image-secondary_none-editable_true.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_image-secondary_none-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_none-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_none-secondary_button-editable_false.png
index fc1a6b89a9..b3366e1c5d 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_none-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_none-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_none-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_none-secondary_button-editable_true.png
index 4d6dfe9335..adbe5adee2 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_none-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_none-secondary_button-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_none-secondary_none-editable_false.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_none-secondary_none-editable_false.png
index 18fc73667a..b85b713240 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_none-secondary_none-editable_false.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_none-secondary_none-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_none-secondary_none-editable_true.png b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_none-secondary_none-editable_true.png
index 2eb427c0d2..8a50577fdd 100644
Binary files a/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_none-secondary_none-editable_true.png and b/cypress/snapshots/base/NcAppSidebar-compact.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_true-header_none-secondary_none-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_false-header_image-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_false-header_image-secondary_button-editable_false.png
index 65d0314685..d05bec6486 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_false-header_image-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_false-header_image-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_false-header_image-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_false-header_image-secondary_button-editable_true.png
index 00f5cb7048..c9975b666f 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_false-header_image-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_false-header_image-secondary_button-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_false-header_none-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_false-header_none-secondary_button-editable_false.png
index 4f9712c754..db3fd62385 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_false-header_none-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_false-header_none-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_false-header_none-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_false-header_none-secondary_button-editable_true.png
index 0c4e00dff1..45b49a4105 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_false-header_none-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_false-compact_false-header_none-secondary_button-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_false-header_image-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_false-header_image-secondary_button-editable_false.png
index 94687245de..02374303ef 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_false-header_image-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_false-header_image-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_false-header_image-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_false-header_image-secondary_button-editable_true.png
index f320c9e2ad..a62e5f3d51 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_false-header_image-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_false-header_image-secondary_button-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_false-header_none-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_false-header_none-secondary_button-editable_false.png
index 55dbc7b7e0..bfe7e8dd5e 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_false-header_none-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_false-header_none-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_false-header_none-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_false-header_none-secondary_button-editable_true.png
index 4e8065112e..f1319e5c70 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_false-header_none-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_null-compact_false-header_none-secondary_button-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_false-header_image-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_false-header_image-secondary_button-editable_false.png
index f74346d050..9afeba4f96 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_false-header_image-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_false-header_image-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_false-header_image-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_false-header_image-secondary_button-editable_true.png
index 7c9b544180..5bc92fb3a3 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_false-header_image-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_false-header_image-secondary_button-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_false-header_none-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_false-header_none-secondary_button-editable_false.png
index a8ac5caacd..735bb6bbf2 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_false-header_none-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_false-header_none-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_false-header_none-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_false-header_none-secondary_button-editable_true.png
index 3349e7ef44..094f3769df 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_false-header_none-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_null-starred_true-compact_false-header_none-secondary_button-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_false-header_image-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_false-header_image-secondary_button-editable_false.png
index dcbb92066b..12d7ae491b 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_false-header_image-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_false-header_image-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_false-header_image-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_false-header_image-secondary_button-editable_true.png
index 122cd8b0aa..508c2dcd8a 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_false-header_image-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_false-header_image-secondary_button-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_false-header_none-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_false-header_none-secondary_button-editable_false.png
index e6972a9693..76ead30d66 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_false-header_none-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_false-header_none-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_false-header_none-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_false-header_none-secondary_button-editable_true.png
index 57904f3902..65f439d372 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_false-header_none-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_false-compact_false-header_none-secondary_button-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_false-header_image-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_false-header_image-secondary_button-editable_false.png
index c139ee6548..47954bc065 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_false-header_image-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_false-header_image-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_false-header_image-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_false-header_image-secondary_button-editable_true.png
index f06fa7d9d5..9c31b8a949 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_false-header_image-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_false-header_image-secondary_button-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_false-header_none-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_false-header_none-secondary_button-editable_false.png
index 8e255e9bf3..de8396045a 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_false-header_none-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_false-header_none-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_false-header_none-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_false-header_none-secondary_button-editable_true.png
index 0616d70c81..d16b8bce14 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_false-header_none-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_null-compact_false-header_none-secondary_button-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_false-header_image-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_false-header_image-secondary_button-editable_false.png
index 24f38e735f..608e8dec94 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_false-header_image-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_false-header_image-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_false-header_image-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_false-header_image-secondary_button-editable_true.png
index 60479f3846..acc506e176 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_false-header_image-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_false-header_image-secondary_button-editable_true.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_false-header_none-secondary_button-editable_false.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_false-header_none-secondary_button-editable_false.png
index fc1a6b89a9..09a86ec346 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_false-header_none-secondary_button-editable_false.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_false-header_none-secondary_button-editable_false.png differ
diff --git a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_false-header_none-secondary_button-editable_true.png b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_false-header_none-secondary_button-editable_true.png
index 4d6dfe9335..9e67edc272 100644
Binary files a/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_false-header_none-secondary_button-editable_true.png and b/cypress/snapshots/base/NcAppSidebar.cy.js/NcAppSidebar.vue-subname_true-starred_true-compact_false-header_none-secondary_button-editable_true.png differ