diff --git a/css/chatview.scss b/css/chatview.scss
index 1d48a8cc7e6..394913ea781 100644
--- a/css/chatview.scss
+++ b/css/chatview.scss
@@ -241,8 +241,8 @@ body:not(#body-public) #chatView .comment .authorRow:not(.currentUser):not(.gues
 
 #chatView .comment.showDate {
 	margin-top: 40px;
-	border-top: 1px solid #dbdbdb;
-	padding-top: 10px;
+	border-top: 1px solid var(--color-border);
+	padding-top: 20px;
 }
 
 #chatView .comment.showDate:before {
@@ -255,9 +255,10 @@ body:not(#body-public) #chatView .comment .authorRow:not(.currentUser):not(.gues
 	padding: 0 7px 0 7px;
 
 	text-align: center;
+	white-space: nowrap;
 
-	color: #878787;
-	background-color: #fff;
+	color: var(--color-text-maxcontrast);
+	background-color: var(--color-main-background);
 }
 
 #chatView .comment.showDate .authorRow {
diff --git a/css/style.scss b/css/style.scss
index 57a0447f9a0..24851ebeab8 100644
--- a/css/style.scss
+++ b/css/style.scss
@@ -56,12 +56,12 @@
 }
 
 #oca-spreedme-add-room {
-	border-bottom: 1px solid $color-border;
+	border-bottom: 1px solid var(--color-border);
 }
 
 .oca-spreedme-add-person {
-	border: 1px solid $color-border;
-	border-radius: $border-radius;
+	border: 1px solid var(--color-border);
+	border-radius: var(--border-radius);
 }
 
 .contactsmenu-popover li > a > img {
@@ -155,9 +155,7 @@ input[type="password"] {
 }
 
 .participantWithList .avatar,
-#app-navigation .avatar,
-#app-navigation .icon-contacts-dark,
-#app-navigation .app-navigation-entry-link .icon-public {
+#app-navigation .app-navigation-entry-link > .avatar {
 	position: absolute;
 	left: 6px;
 	top: 6px;
@@ -170,8 +168,8 @@ input[type="password"] {
 	margin: 0 !important;
 }
 
-.select2-result .icon-contacts.avatar,
-.select2-result .icon-public-white.avatar,
+.select2-result .icon-contacts-dark.avatar,
+.select2-result .icon-public.avatar,
 .select2-result .icon-mail.avatar,
 #app-navigation .app-navigation-entry-link .avatar.icon {
 	border-radius: 50%;
@@ -210,7 +208,6 @@ input[type="password"] {
 	span {
 		padding: 2px 5px;
 		border-radius: 10px;
-		background-color: nc-lighten($color-main-text, 90%);
 		font-weight: bold;
 	}
 
@@ -596,11 +593,11 @@ input[type="password"] {
 	flex-grow: 0;
 	padding: 12px;
 	text-align: center;
-	border-bottom: 1px solid $color-border;
+	border-bottom: 1px solid var(--color-border);
 	margin-bottom: 0;
 
 	.icon, a {
-		color: $color-main-text;
+		color: var(--color-main-text);
 		opacity: .5;
 	}
 }
@@ -1071,3 +1068,12 @@ input[type="password"] {
 #app-sidebar #participantsTabView .participant:last-child {
 	margin-bottom: 15px;
 }
+
+/**
+ * Dark-Theme fixes
+ */
+#app-navigation > ul > li > a:first-child {
+	img {
+		filter: none !important;
+	}
+}
diff --git a/img/no-password.svg b/img/no-password.svg
index 981197eda76..a8da25c4642 100644
--- a/img/no-password.svg
+++ b/img/no-password.svg
@@ -1 +1 @@
-<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 71 100"><path stroke-width=".16" d="m8 0c-2.2091 0-4 1.7909-4 4v3h-1v7h10v-7h-1-2-2-2v-3c0-1.1046 0.8954-2 2-2s2 0.8954 2 2v1h2v-1c0-2.2091-1.791-4-4-4z" transform="matrix(6.25,0,0,6.25,-14.5,0)"/></svg>
\ No newline at end of file
+<svg xmlns="http://www.w3.org/2000/svg" height="16" width="16" version="1.1" viewBox="0 0 71 100"><path stroke-width=".16" d="m8 0c-2.2091 0-4 1.7909-4 4v3h-1v7h10v-7h-1-2-2-2v-3c0-1.1046 0.8954-2 2-2s2 0.8954 2 2v1h2v-1c0-2.2091-1.791-4-4-4z" transform="matrix(6.25,0,0,6.25,-14.5,0)" fill="#000"/></svg>
diff --git a/js/app.js b/js/app.js
index 48231662325..fb9c42599c9 100644
--- a/js/app.js
+++ b/js/app.js
@@ -153,11 +153,11 @@
 				},
 				formatResult: function (element) {
 					if (element.type === "createPublicRoom") {
-						return '<span><div class="avatar icon-public-white"></div>' + escapeHTML(element.displayName) + '</span>';
+						return '<span><div class="avatar icon-public"></div>' + escapeHTML(element.displayName) + '</span>';
 					}
 
 					if (element.type === "createGroupRoom" || element.type === 'group') {
-						return '<span><div class="avatar icon-contacts"></div>' + escapeHTML(element.displayName) + '</span>';
+						return '<span><div class="avatar icon-contacts-dark"></div>' + escapeHTML(element.displayName) + '</span>';
 					}
 
 					return '<span><div class="avatar" data-user="' + escapeHTML(element.id) + '" data-user-display-name="' + escapeHTML(element.displayName) + '"></div>' + escapeHTML(element.displayName) + '</span>';
diff --git a/js/views/callinfoview.js b/js/views/callinfoview.js
index 10cc8de23f7..e62ae9e5b9f 100644
--- a/js/views/callinfoview.js
+++ b/js/views/callinfoview.js
@@ -48,11 +48,11 @@
 		'		{{#if isPublic}}' +
 		'			<div class="clipboard-button"><span class="button icon-clippy"></span></div>' +
 		'			<div class="password-button">' +
-		'				<span class="button {{#if hasPassword}}icon-password"{{else}}icon-no-password{{/if}}"></span>' +
+		'				<span class="button {{#if hasPassword}}icon-password{{else}}icon-no-password{{/if}}"></span>' +
 		'				<div class="popovermenu password-menu menu-right">' +
 		'					<ul>' +
 		'						<li>' +
-		'							<span class="menuitem {{#if hasPassword}}icon-password"{{else}}icon-no-password{{/if}} password-option">' +
+		'							<span class="menuitem {{#if hasPassword}}icon-password{{else}}icon-no-password{{/if}} password-option">' +
 		'								<form class="password-form">' +
 		'									<input class="password-input" required maxlength="200" type="password"' +
 		'				  						placeholder="{{#if hasPassword}}' + t('spreed', 'Change password') + '{{else}}' + t('spreed', 'Set password') + '{{/if}}">'+
diff --git a/js/views/participantview.js b/js/views/participantview.js
index e0419544649..e8414089e19 100644
--- a/js/views/participantview.js
+++ b/js/views/participantview.js
@@ -148,7 +148,7 @@
 					if (element.type === 'emails') {
 						return '<span><div class="avatar icon-mail"></div>' + escapeHTML(element.displayName) + '</span>';
 					} else if (element.type === 'groups') {
-						return '<span><div class="avatar icon-contacts"></div>' + escapeHTML(element.displayName) + '</span>';
+						return '<span><div class="avatar icon-contacts-dark"></div>' + escapeHTML(element.displayName) + '</span>';
 					}
 
 					return '<span><div class="avatar" data-user="' + escapeHTML(element.id) + '" data-user-display-name="' + escapeHTML(element.displayName) + '"></div>' + escapeHTML(element.displayName) + '</span>';
diff --git a/js/views/roomlistview.js b/js/views/roomlistview.js
index 1b49c30e4ac..6497e96bafd 100644
--- a/js/views/roomlistview.js
+++ b/js/views/roomlistview.js
@@ -156,13 +156,13 @@
 		templateContext: function() {
 			var icon = '';
 			if (this.model.get('objectType') === 'file') {
-				icon = 'icon icon-file-white';
+				icon = 'icon icon-file';
 			} else if (this.model.get('objectType') === 'share:password') {
-				icon = 'icon icon-password-white';
+				icon = 'icon icon-password';
 			} else if (this.model.get('type') === OCA.SpreedMe.app.ROOM_TYPE_GROUP) {
-				icon = 'icon icon-contacts';
+				icon = 'icon icon-contacts-dark';
 			} else if (this.model.get('type') === OCA.SpreedMe.app.ROOM_TYPE_PUBLIC) {
-				icon = 'icon icon-public-white';
+				icon = 'icon icon-public';
 			}
 
 			// If a room is a one2one room it can not be removed from the list, only be deleted for both participants.