diff --git a/src/assets/NcAppNavigationItem.scss b/src/assets/NcAppNavigationItem.scss
index 38e42c383e..d39b040a17 100644
--- a/src/assets/NcAppNavigationItem.scss
+++ b/src/assets/NcAppNavigationItem.scss
@@ -47,6 +47,10 @@
 			}
 		}
 
+		:deep(.icon-collapse) {
+			color: var(--color-main-text) !important;
+		}
+
 		&:not(.app-navigation-entry--editing)::before {
 			content: '';
 			position: absolute;
diff --git a/src/components/NcAppNavigationItem/NcAppNavigationIconCollapsible.vue b/src/components/NcAppNavigationItem/NcAppNavigationIconCollapsible.vue
index 7df8e34a25..c8890390a7 100644
--- a/src/components/NcAppNavigationItem/NcAppNavigationIconCollapsible.vue
+++ b/src/components/NcAppNavigationItem/NcAppNavigationIconCollapsible.vue
@@ -87,10 +87,10 @@ export default {
 	inset-inline-end: 0;
 
 	// the whole navigation item is hovered thus will have the hover color - to distinguish we need to set a different color here.
-	&:hover {
+	&.button-vue--legacy34:hover {
 		background-color: var(--color-background-dark) !important;
 	}
-	&--active:hover {
+	&--active.button-vue--legacy34:hover {
 		background-color: var(--color-primary-element) !important;
 	}
 }
diff --git a/src/components/NcAppSettingsDialog/NcAppSettingsDialog.vue b/src/components/NcAppSettingsDialog/NcAppSettingsDialog.vue
index f4a8ed0353..465754dced 100644
--- a/src/components/NcAppSettingsDialog/NcAppSettingsDialog.vue
+++ b/src/components/NcAppSettingsDialog/NcAppSettingsDialog.vue
@@ -278,6 +278,15 @@ $content-inset: calc(3 * var(--default-grid-baseline));
 		max-width: 900px;
 	}
 
+	:deep(.modal-container__close) {
+		background-color: var(--color-primary-element-light) !important;
+
+		&:hover,
+		&:focus-visible {
+			background-color: var(--color-primary-element-light-hover) !important;
+		}
+	}
+
 	:deep(.dialog__name) {
 		position: absolute;
 		width: 1px;
@@ -342,6 +351,7 @@ $content-inset: calc(3 * var(--default-grid-baseline));
 			background-color: transparent;
 			border: none;
 			color: var(--color-main-text);
+			transition: background-color var(--animation-quick, 200ms) ease-in-out;
 
 			&:hover,
 			&:focus-visible {
@@ -364,11 +374,12 @@ $content-inset: calc(3 * var(--default-grid-baseline));
 				&::before {
 					content: '';
 					position: absolute;
-					inset-block: var(--default-grid-baseline);
+					inset-block: calc(var(--default-grid-baseline, 4px) * 2);
 					inset-inline-start: 0;
 					width: 3px;
 					background-color: var(--color-primary-element);
 					border-radius: 999px;
+					animation: nc-settings-pill-in var(--animation-quick, 200ms) ease-out;
 				}
 			}
 
@@ -475,6 +486,17 @@ $content-inset: calc(3 * var(--default-grid-baseline));
 		}
 	}
 }
+
+@keyframes nc-settings-pill-in {
+	from {
+		transform: scaleY(0);
+		opacity: 0;
+	}
+	to {
+		transform: scaleY(1);
+		opacity: 1;
+	}
+}
 </style>
 
 <docs>