diff --git a/ui-ngx/src/app/core/core.module.ts b/ui-ngx/src/app/core/core.module.ts
index 69d8b9b19e..8e6f550172 100644
--- a/ui-ngx/src/app/core/core.module.ts
+++ b/ui-ngx/src/app/core/core.module.ts
@@ -35,12 +35,9 @@ import { TbMissingTranslationHandler } from './translate/missing-translate-handl
 import { MatButtonModule } from '@angular/material/button';
 import { MatDialogModule } from '@angular/material/dialog';
 import { MatSnackBarModule } from '@angular/material/snack-bar';
-import { ConfirmDialogComponent } from '@core/services/dialog/confirm-dialog.component';
 import { FlexLayoutModule } from '@angular/flex-layout';
 import { TranslateDefaultCompiler } from '@core/translate/translate-default-compiler';
-import { AlertDialogComponent } from '@core/services/dialog/alert-dialog.component';
 import { WINDOW_PROVIDERS } from '@core/services/window.service';
-import {TodoDialogComponent} from '@core/services/dialog/todo-dialog.component';
 import { HotkeyModule } from 'angular2-hotkeys';
 
 export function HttpLoaderFactory(http: HttpClient) {
@@ -48,11 +45,6 @@ export function HttpLoaderFactory(http: HttpClient) {
 }
 
 @NgModule({
-  declarations: [
-    ConfirmDialogComponent,
-    AlertDialogComponent,
-    TodoDialogComponent
-  ],
   imports: [
     CommonModule,
     HttpClientModule,
diff --git a/ui-ngx/src/app/core/services/dialog.service.ts b/ui-ngx/src/app/core/services/dialog.service.ts
index 5fc7d8293f..3b52e6fec6 100644
--- a/ui-ngx/src/app/core/services/dialog.service.ts
+++ b/ui-ngx/src/app/core/services/dialog.service.ts
@@ -17,10 +17,7 @@
 import { Injectable } from '@angular/core';
 import { Observable } from 'rxjs';
 import { MatDialog, MatDialogConfig } from '@angular/material/dialog';
-import { ConfirmDialogComponent } from '@core/services/dialog/confirm-dialog.component';
 import { TranslateService } from '@ngx-translate/core';
-import { AlertDialogComponent } from '@core/services/dialog/alert-dialog.component';
-import { TodoDialogComponent } from '@core/services/dialog/todo-dialog.component';
 import { AuthService } from '@core/auth/auth.service';
 import {
   ColorPickerDialogComponent,
@@ -30,6 +27,9 @@ import {
   MaterialIconsDialogComponent,
   MaterialIconsDialogData
 } from '@shared/components/dialog/material-icons-dialog.component';
+import { ConfirmDialogComponent } from '@shared/components/dialog/confirm-dialog.component';
+import { AlertDialogComponent } from '@shared/components/dialog/alert-dialog.component';
+import { TodoDialogComponent } from '@shared/components/dialog/todo-dialog.component';
 
 @Injectable(
   {
diff --git a/ui-ngx/src/app/core/services/dialog/alert-dialog.component.html b/ui-ngx/src/app/shared/components/dialog/alert-dialog.component.html
similarity index 100%
rename from ui-ngx/src/app/core/services/dialog/alert-dialog.component.html
rename to ui-ngx/src/app/shared/components/dialog/alert-dialog.component.html
diff --git a/ui-ngx/src/app/core/services/dialog/alert-dialog.component.scss b/ui-ngx/src/app/shared/components/dialog/alert-dialog.component.scss
similarity index 100%
rename from ui-ngx/src/app/core/services/dialog/alert-dialog.component.scss
rename to ui-ngx/src/app/shared/components/dialog/alert-dialog.component.scss
diff --git a/ui-ngx/src/app/core/services/dialog/alert-dialog.component.ts b/ui-ngx/src/app/shared/components/dialog/alert-dialog.component.ts
similarity index 100%
rename from ui-ngx/src/app/core/services/dialog/alert-dialog.component.ts
rename to ui-ngx/src/app/shared/components/dialog/alert-dialog.component.ts
diff --git a/ui-ngx/src/app/core/services/dialog/confirm-dialog.component.html b/ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.html
similarity index 100%
rename from ui-ngx/src/app/core/services/dialog/confirm-dialog.component.html
rename to ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.html
diff --git a/ui-ngx/src/app/core/services/dialog/confirm-dialog.component.scss b/ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.scss
similarity index 100%
rename from ui-ngx/src/app/core/services/dialog/confirm-dialog.component.scss
rename to ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.scss
diff --git a/ui-ngx/src/app/core/services/dialog/confirm-dialog.component.ts b/ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.ts
similarity index 100%
rename from ui-ngx/src/app/core/services/dialog/confirm-dialog.component.ts
rename to ui-ngx/src/app/shared/components/dialog/confirm-dialog.component.ts
diff --git a/ui-ngx/src/app/core/services/dialog/todo-dialog.component.html b/ui-ngx/src/app/shared/components/dialog/todo-dialog.component.html
similarity index 100%
rename from ui-ngx/src/app/core/services/dialog/todo-dialog.component.html
rename to ui-ngx/src/app/shared/components/dialog/todo-dialog.component.html
diff --git a/ui-ngx/src/app/core/services/dialog/todo-dialog.component.scss b/ui-ngx/src/app/shared/components/dialog/todo-dialog.component.scss
similarity index 100%
rename from ui-ngx/src/app/core/services/dialog/todo-dialog.component.scss
rename to ui-ngx/src/app/shared/components/dialog/todo-dialog.component.scss
diff --git a/ui-ngx/src/app/core/services/dialog/todo-dialog.component.ts b/ui-ngx/src/app/shared/components/dialog/todo-dialog.component.ts
similarity index 100%
rename from ui-ngx/src/app/core/services/dialog/todo-dialog.component.ts
rename to ui-ngx/src/app/shared/components/dialog/todo-dialog.component.ts
diff --git a/ui-ngx/src/app/shared/shared.module.ts b/ui-ngx/src/app/shared/shared.module.ts
index 45c980e986..a00b7c191d 100644
--- a/ui-ngx/src/app/shared/shared.module.ts
+++ b/ui-ngx/src/app/shared/shared.module.ts
@@ -108,6 +108,9 @@ import { MatChipDraggableDirective } from '@shared/components/mat-chip-draggable
 import { ColorInputComponent } from '@shared/components/color-input.component';
 import { JsFuncComponent } from '@shared/components/js-func.component';
 import { JsonFormComponent } from '@shared/components/json-form/json-form.component';
+import { ConfirmDialogComponent } from '@shared/components/dialog/confirm-dialog.component';
+import { AlertDialogComponent } from '@shared/components/dialog/alert-dialog.component';
+import { TodoDialogComponent } from '@shared/components/dialog/todo-dialog.component';
 import { MaterialIconsDialogComponent } from '@shared/components/dialog/material-icons-dialog.component';
 import { MaterialIconSelectComponent } from '@shared/components/material-icon-select.component';
 import { ImageInputComponent } from '@shared/components/image-input.component';
@@ -178,6 +181,9 @@ import { LedLightComponent } from '@shared/components/led-light.component';
     FabActionsDirective,
     FabToolbarComponent,
     WidgetsBundleSelectComponent,
+    ConfirmDialogComponent,
+    AlertDialogComponent,
+    TodoDialogComponent,
     ColorPickerDialogComponent,
     MaterialIconsDialogComponent,
     ColorInputComponent,