diff --git a/src/app/components/home/_dialogs/password-reset/password-reset.component.html b/src/app/components/home/_dialogs/password-reset/password-reset.component.html
index e91e73009c7b12d9e39eb911f383a2a680a8a0c0..bd180a4ec815fc9add2809d0839b34db8c9be669 100644
--- a/src/app/components/home/_dialogs/password-reset/password-reset.component.html
+++ b/src/app/components/home/_dialogs/password-reset/password-reset.component.html
@@ -11,7 +11,7 @@
     </mat-error>
   </mat-form-field>
 
-  <button mat-raised-button color="primary" type="submit">
+  <button mat-raised-button type="submit">
     {{ 'password-reset.reset-password' | translate }}
   </button>
 </form>
diff --git a/src/app/components/home/_dialogs/password-reset/password-reset.component.scss b/src/app/components/home/_dialogs/password-reset/password-reset.component.scss
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..bf03489f63d032ab645da4467f4e61709f220eb8 100644
--- a/src/app/components/home/_dialogs/password-reset/password-reset.component.scss
+++ b/src/app/components/home/_dialogs/password-reset/password-reset.component.scss
@@ -0,0 +1,8 @@
+mat-form-field {
+  color: var(--on-surface);
+}
+
+.mat-raised-button {
+  color: var(--on-primary);
+  background-color: var(--primary);
+}
diff --git a/src/app/components/home/_dialogs/register/register.component.scss b/src/app/components/home/_dialogs/register/register.component.scss
index e69de29bb2d1d6434b8b29ae775ad8c2e48c5391..bf03489f63d032ab645da4467f4e61709f220eb8 100644
--- a/src/app/components/home/_dialogs/register/register.component.scss
+++ b/src/app/components/home/_dialogs/register/register.component.scss
@@ -0,0 +1,8 @@
+mat-form-field {
+  color: var(--on-surface);
+}
+
+.mat-raised-button {
+  color: var(--on-primary);
+  background-color: var(--primary);
+}
diff --git a/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss b/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss
index 3ae4b91c17203361a0ca19acb9b0ed2ecd9b796d..cdbe9b082898fe6f569c5a84b28991d454b4b3af 100644
--- a/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss
+++ b/src/app/components/shared/_dialogs/create-comment/create-comment.component.scss
@@ -16,6 +16,7 @@ app-comment-list {
 
 textarea {
   line-height: 120%;
+  color: var(--on-surface);
 }
 
 .send {
diff --git a/src/app/components/shared/_dialogs/room-create/room-create.component.scss b/src/app/components/shared/_dialogs/room-create/room-create.component.scss
index f7a8134c25177fea3c40a712136c99684806aa9a..20905c09a3be6ca1fe500d627c63fc2e4a3ee506 100644
--- a/src/app/components/shared/_dialogs/room-create/room-create.component.scss
+++ b/src/app/components/shared/_dialogs/room-create/room-create.component.scss
@@ -2,3 +2,27 @@
   background-color: var(--primary);
   color: var(--on-primary);
 }
+
+input {
+  color: var(--on-surface);
+}
+
+.placeholder {
+  color: var(--on-surface);
+}
+
+::ng-deep .mat-form-field-label {
+  color: var(--on-surface)!important;
+}
+
+::ng-deep .mat-form-field-underline {
+  background-color: var(--on-surface)!important;
+}
+
+::ng-deep .mat-form-field-ripple {
+  background-color: var(--on-surface)!important;
+}
+
+mat-form-field {
+  color: var(--on-surface);
+}
diff --git a/src/app/components/shared/_dialogs/statistic-help/statistic-help.component.scss b/src/app/components/shared/_dialogs/statistic-help/statistic-help.component.scss
index a8bc1a483a38f177478398fdea674ee8c5c89736..caf51f1875eedc8d74d23b4ee3e4346d9de5294e 100644
--- a/src/app/components/shared/_dialogs/statistic-help/statistic-help.component.scss
+++ b/src/app/components/shared/_dialogs/statistic-help/statistic-help.component.scss
@@ -19,3 +19,11 @@ mat-chip {
   display: flex;
   justify-content: center;
 }
+
+h3 {
+  color: var(--on-surface);
+}
+
+mat-icon {
+  color: var(--on-surface);
+}
diff --git a/src/app/components/shared/login/login.component.scss b/src/app/components/shared/login/login.component.scss
index a4ed6de83dd549954b342f6a725c773228af5139..95deb413a19b62496965f9d7e7b55404916cf075 100644
--- a/src/app/components/shared/login/login.component.scss
+++ b/src/app/components/shared/login/login.component.scss
@@ -24,5 +24,18 @@ input:-webkit-autofill {
   -webkit-box-shadow: 0 0 0 1000px var(--dialog) inset;
 }
 
+::ng-deep .mat-form-field-label {
+  color: var(--on-surface)!important;
+}
 
+::ng-deep .mat-form-field-underline {
+  background-color: var(--on-surface)!important;
+}
 
+::ng-deep .mat-form-field-ripple {
+  background-color: var(--on-surface)!important;
+}
+
+mat-form-field {
+  color: var(--on-surface);
+}
diff --git a/src/app/components/shared/statistics-page/statistics-page.component.html b/src/app/components/shared/statistics-page/statistics-page.component.html
index 7ec10b1de45c754910bb6f471ef30563cc339490..2b54c29849b044d087616b9da0502b172d76b1e7 100644
--- a/src/app/components/shared/statistics-page/statistics-page.component.html
+++ b/src/app/components/shared/statistics-page/statistics-page.component.html
@@ -4,7 +4,7 @@
       <mat-card-header>
         <h2>{{'statistic.answer-statistic' | translate}}</h2>
         <span class="fill-remaining-space"></span>
-        <button mat-icon-button (click)="showHelp()"><mat-icon color="primary">help</mat-icon></button>
+        <button mat-icon-button (click)="showHelp()"><mat-icon>help</mat-icon></button>
       </mat-card-header>
       <mat-divider></mat-divider>
       <div *ngIf="isLoading"                                                                                                                                                                                                                                                                                                                                                          fxLayout="column" fxLayoutAlign="center" fxLayoutGap="20px" fxFill>
diff --git a/src/app/components/shared/statistics-page/statistics-page.component.scss b/src/app/components/shared/statistics-page/statistics-page.component.scss
index e49933b050ca00fb4eb635842e8cf4671844822a..f43fb7c31ef8c4166468456bdaf680394cac68d7 100644
--- a/src/app/components/shared/statistics-page/statistics-page.component.scss
+++ b/src/app/components/shared/statistics-page/statistics-page.component.scss
@@ -8,3 +8,19 @@ mat-card {
 h2 {
   color: var(--on-surface);
 }
+
+.mat-icon-button {
+  color: var(--secondary);
+}
+
+::ng-deep .mat-tab-label {
+  color: var(--on-surface);
+}
+
+::ng-deep .mat-tab-label-active {
+  color: var(--on-surface);
+}
+
+::ng-deep .mat-ink-bar {
+  background-color: var(--primary) !important;
+}