--- lgmc-gui-rah.module.ts
+++ lgmc-gui-rah.module.ts
@@ -23,9 +23,7 @@ import { GeneralService, RahService } from 'src/shared/lgmc-api-artifacts/src/se
 import { LgmcPlatformUtilsModule } from 'src/shared/lgmc-platform/lgmc-platform-utils/lgmc-platform-utils.module';
 
 import { LgmcGCircleIndicatorModule } from 'src/shared/lgmc-g/lgmc-g-circle-indicator/lgmc-g-circle-indicator.module';
-import { LgmcGCustomButtonModule } from 'src/shared/lgmc-g/lgmc-g-button/lgmc-g-button.module';
 import { LgmcGImageModule } from 'src/shared/lgmc-g/lgmc-g-image/lgmc-g-image.module';
-import { LgmcGIndicatorModule } from 'src/shared/lgmc-g/lgmc-g-indicator/lgmc-g-indicator.module';
 import { LgmcGPriorityTagModule } from 'src/shared/lgmc-g/lgmc-g-priority-tag/lgmc-g-priority-tag.module';
 import { LgmcGTableMapModule } from 'src/shared/lgmc-g/lgmc-g-table-map/lgmc-g-table-map.module';
 
@@ -58,10 +56,8 @@ import { LgmcPlatformDbApiModule } from 'src/shared/lgmc-platform/lgmc-platform-
     InputTextareaModule,
     InputTextModule,
     LgmcGCircleIndicatorModule,
-    LgmcGCustomButtonModule,
     LgmcGeovistoModule,
     LgmcGImageModule,
-    LgmcGIndicatorModule,
     LgmcGPriorityTagModule,
     LgmcGTableMapModule,
     LgmcPlatformDbApiModule,
--- model/lgmc-gui-rah.model.ts
+++ model/lgmc-gui-rah.model.ts
@@ -44,6 +44,7 @@ export type LgmcGuiRahConfig = LgmcModuleConfig & {
   providers?: {
     dashboard?: {
       card?: {
+        id: string,
         enabled?: boolean,
         title?: string,
         description?: string,
@@ -53,6 +54,7 @@ export type LgmcGuiRahConfig = LgmcModuleConfig & {
         iconColor?: string
       },
       indicator?: {
+        id: string,
         enabled?: boolean,
         image?: string,
         title?: string,
--- services/lgmc-gui-rah-dashboard-provider.service.ts
+++ services/lgmc-gui-rah-dashboard-provider.service.ts
@@ -5,10 +5,12 @@ import { LgmcPlatformAppStateService } from 'src/shared/lgmc-platform/lgmc-platf
 import { LgmcPlatformDbApiService } from 'src/shared/lgmc-platform/lgmc-platform-db-api/services/lgmc-platform-db-api.service';
 import { RahCity, RahHazard } from 'src/shared/lgmc-api-artifacts/src/models';
 
-import { LgmcGDashboardCardModel, LgmcGDashboardControls, LgmcGDashboardData, LgmcGDashboardProvider, LgmcGDashboardIndicatorModel, LgmcGDashboardAbstractProvider } from 'src/shared/lgmc-g/lgmc-g-dashboard/model/lgmc-g-dashboard.model';
+import { LgmcGDashboardProvider, LgmcGDashboardAbstractProvider, LgmcGDashboardWidgets } from 'src/shared/lgmc-g/lgmc-g-dashboard/model/lgmc-g-dashboard.model';
 import { LgmcGColor, LgmcGColorError, LgmcGColorOK, LgmcGColorWarning } from 'src/shared/lgmc-g/lgmc-g-util/model/lgmc-g-util.model';
 
 import { LgmcGuiRahConfig, lgmcGuiRahModuleId } from '../model/lgmc-gui-rah.model';
+import { LgmcGAlertCardComponent } from 'src/shared/lgmc-g/lgmc-g-alert-card/components/lgmc-g-alert-card/lgmc-g-alert-card.component';
+import { LgmcGCircleIndicatorComponent } from 'src/shared/lgmc-g/lgmc-g-circle-indicator/components/lgmc-g-circle-indicator/lgmc-g-circle-indicator.component';
 
 /**
  * Dashboard provider of RAH module.
@@ -47,17 +49,18 @@ export class LgmcGuiRahDashboardProviderService extends LgmcGDashboardAbstractPr
    *
    * @returns dashboard data
    */
-  public async loadDashboardData(enableCards: boolean = true, enableIndicators: boolean = true): Promise<LgmcGDashboardData> {
+  public async loadDashboardData(enableCards: boolean = true, enableIndicators: boolean = true): Promise<LgmcGDashboardWidgets> {
     const moduleConfig = <LgmcGuiRahConfig> this.appStateService.getModuleConfig(lgmcGuiRahModuleId);
     this.processParameters(moduleConfig);
     if(moduleConfig.enabled) {
       const data = await this.reloadData(moduleConfig, enableCards, enableIndicators);
-      return {
-        cards: enableCards ? this.createCards(data, moduleConfig) : [],
-        indicators: enableIndicators ? this.createIndicators(data, moduleConfig) : []
-      };
+      let widgets: LgmcGDashboardWidgets = [];
+      if (enableCards)
+        widgets.push(...this.createCards(data, moduleConfig));
+      if (enableIndicators)
+        widgets.push(...this.createIndicators(data, moduleConfig));
     }
-    return { cards: [], indicators: [] };
+    return [];
   }
 
   /**
@@ -91,21 +94,25 @@ export class LgmcGuiRahDashboardProviderService extends LgmcGDashboardAbstractPr
    *
    * @returns cards
    */
-  protected createCards(hazards: RahHazard[], moduleConfig: LgmcGuiRahConfig): LgmcGDashboardCardModel[] {
+  protected createCards(hazards: RahHazard[], moduleConfig: LgmcGuiRahConfig): LgmcGDashboardWidgets {
     if(hazards) {
       const cardConfig = moduleConfig?.providers?.dashboard?.card;
 
       if(cardConfig?.enabled ?? true) {
         return [{
-          type: "value",
-          title: cardConfig?.title ?? "lgmc-gui-rah.dashboard-card.title",
-          description: cardConfig?.description ?? "lgmc-gui-rah.dashboard-card.description",
-          tooltip: cardConfig?.tooltip ?? "lgmc-gui-rah.dashboard-card.tooltip",
-          tooltipPosition: cardConfig?.tooltipPosition ?? "right",
-          icon: cardConfig?.icon ?? "pi pi-bell",
-          iconColor: cardConfig?.iconColor ?? "#f57c00",
-          value: hazards ? hazards.length.toString() : "0",
-          onCardClick: () => { this.onCardClick(); },
+          id: cardConfig.id,
+          component: LgmcGAlertCardComponent,
+          inputs: {
+            type: "value",
+            title: cardConfig?.title ?? "lgmc-gui-rah.dashboard-card.title",
+            description: cardConfig?.description ?? "lgmc-gui-rah.dashboard-card.description",
+            tooltip: cardConfig?.tooltip ?? "lgmc-gui-rah.dashboard-card.tooltip",
+            tooltipPosition: cardConfig?.tooltipPosition ?? "right",
+            icon: cardConfig?.icon ?? "pi pi-bell",
+            iconColor: cardConfig?.iconColor ?? "#f57c00",
+            value: hazards ? hazards.length.toString() : "0",
+            onCardClick: () => { this.onCardClick(); },
+          }
         }];
       }
     }
@@ -133,26 +140,30 @@ export class LgmcGuiRahDashboardProviderService extends LgmcGDashboardAbstractPr
    *
    * @returns indicators
    */
-  protected createIndicators(hazards: RahHazard[], moduleConfig: LgmcGuiRahConfig): LgmcGDashboardIndicatorModel[] {
+  protected createIndicators(hazards: RahHazard[], moduleConfig: LgmcGuiRahConfig): LgmcGDashboardWidgets {
     if(hazards) {
       const indicatorConfig = moduleConfig?.providers?.dashboard?.indicator;
 
       if((indicatorConfig?.enabled ?? true)) {
         const indicatorVals = this.getRahIndicatorVals(hazards);
         return [{
-          image: indicatorConfig?.image ?? this.image,
-          title: indicatorConfig?.title ?? "lgmc-gui-rah.dashboard-indicator.title",
-          colorUL: this.getIndicatorQuadrantColor(indicatorVals[1]),
-          textUL: indicatorConfig?.p1Label ?? "lgmc-gui-rah.dashboard-indicator.p1",
-          colorUR: this.getIndicatorQuadrantColor(indicatorVals[2]),
-          textUR: indicatorConfig?.p2Label ?? "lgmc-gui-rah.dashboard-indicator.p2",
-          colorBL: this.getIndicatorQuadrantColor(indicatorVals[3]),
-          textBL: indicatorConfig?.p3Label ?? "lgmc-gui-rah.dashboard-indicator.p3",
-          colorBR: this.getIndicatorQuadrantColor(indicatorVals[4]),
-          textBR: indicatorConfig?.p4Label ?? "lgmc-gui-rah.dashboard-indicator.p4",
-          finalColor: this.getFinalColor(indicatorVals),
-          textCenter: undefined,
-          onClick: () => { this.onIndicatorClick() }
+          id: indicatorConfig.id,
+          component: LgmcGCircleIndicatorComponent,
+          inputs: {
+            image: indicatorConfig?.image ?? this.image,
+            title: indicatorConfig?.title ?? "lgmc-gui-rah.dashboard-indicator.title",
+            colorUL: this.getIndicatorQuadrantColor(indicatorVals[1]),
+            textUL: indicatorConfig?.p1Label ?? "lgmc-gui-rah.dashboard-indicator.p1",
+            colorUR: this.getIndicatorQuadrantColor(indicatorVals[2]),
+            textUR: indicatorConfig?.p2Label ?? "lgmc-gui-rah.dashboard-indicator.p2",
+            colorBL: this.getIndicatorQuadrantColor(indicatorVals[3]),
+            textBL: indicatorConfig?.p3Label ?? "lgmc-gui-rah.dashboard-indicator.p3",
+            colorBR: this.getIndicatorQuadrantColor(indicatorVals[4]),
+            textBR: indicatorConfig?.p4Label ?? "lgmc-gui-rah.dashboard-indicator.p4",
+            finalColor: this.getFinalColor(indicatorVals),
+            textCenter: undefined,
+            onClick: () => { this.onIndicatorClick() }
+          }
         }];
       }
     }
