diff --git a/src/client/app/common/views/components/ui/card.vue b/src/client/app/common/views/components/ui/card.vue
index a37a38d340..988c5ad3cf 100644
--- a/src/client/app/common/views/components/ui/card.vue
+++ b/src/client/app/common/views/components/ui/card.vue
@@ -1,5 +1,5 @@
 <template>
-<div class="ui-card">
+<div class="ui-card" :class="{ shadow: $store.state.settings.useShadow }">
 	<header>
 		<slot name="title"></slot>
 	</header>
@@ -24,7 +24,10 @@ export default Vue.extend({
 	margin 16px
 	color var(--faceText)
 	background var(--face)
-	box-shadow 0 3px 1px -2px rgba(#000, 0.2), 0 2px 2px 0 rgba(#000, 0.14), 0 1px 5px 0 rgba(#000, 0.12)
+	border-radius var(--round)
+
+	&.shadow
+		box-shadow 0 3px 1px -2px rgba(#000, 0.2), 0 2px 2px 0 rgba(#000, 0.14), 0 1px 5px 0 rgba(#000, 0.12)
 
 	> header
 		padding 16px
diff --git a/src/client/app/desktop/views/components/settings.vue b/src/client/app/desktop/views/components/settings.vue
index 09e681c9bb..069d50181c 100644
--- a/src/client/app/desktop/views/components/settings.vue
+++ b/src/client/app/desktop/views/components/settings.vue
@@ -573,7 +573,8 @@ export default Vue.extend({
 		height 100%
 		padding 16px 0 0 0
 		overflow auto
-		border-right solid 1px var(--faceDivider)
+		box-shadow var(--shadowRight)
+		z-index 1
 
 		> p
 			display block