diff --git a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmdetails/alarmdetails.component.ts b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmdetails/alarmdetails.component.ts
index 0767cd9..3f20e94 100644
--- a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmdetails/alarmdetails.component.ts
+++ b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmdetails/alarmdetails.component.ts
@@ -18,7 +18,6 @@
 import {
     FnService,
     IconService,
-    LoadingService,
     LogService,
     DetailsPanelBaseImpl,
     WebSocketService,
@@ -63,12 +62,11 @@
 
     constructor(
         protected fs: FnService,
-        protected ls: LoadingService,
         protected log: LogService,
         protected is: IconService,
         protected wss: WebSocketService
     ) {
-        super(fs, ls, log, wss, 'alarmTable');
+        super(fs, log, wss, 'alarmTable');
     }
 
     ngOnInit() {
diff --git a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.html b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.html
index 534819e..42add2b 100644
--- a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.html
+++ b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.html
@@ -14,7 +14,8 @@
 ~ limitations under the License.
 -->
 <div id="ov-alarm-table">
-  <div class="tabular-header">
+    <onos-loading [theme]="'light'" [running]="loadingIconShown"></onos-loading>
+    <div class="tabular-header">
     <h2>Alarms  for {{ "all devices."}} ({{ tableData.length }} total)</h2>
     <div class="ctrl-btns">
       <div class="refresh" (click)="toggleRefresh()">
diff --git a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.spec.ts b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.spec.ts
index ccad204..dcabe08 100644
--- a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.spec.ts
+++ b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.spec.ts
@@ -15,24 +15,16 @@
  */
 import { async, ComponentFixture, TestBed } from '@angular/core/testing';
 import { ActivatedRoute, Params } from '@angular/router';
-import { DebugElement } from '@angular/core';
 import { BrowserAnimationsModule } from '@angular/platform-browser/animations';
 import { FormsModule } from '@angular/forms';
-import { By } from '@angular/platform-browser';
 import { AlarmTableComponent } from './alarmtable.component';
 import { AlarmDetailsComponent } from '../alarmdetails/alarmdetails.component';
 import {
     FnService,
     IconService,
-    GlyphService,
     IconComponent,
-    LoadingService,
     LogService,
-    NavService,
-    MastService,
-    TableFilterPipe,
-    ThemeService,
-    WebSocketService
+    TableFilterPipe, LoadingComponent,
 } from 'gui2-fw-lib';
 
 import { of } from 'rxjs';
@@ -50,12 +42,6 @@
     loadIconDef() { }
 }
 
-class MockLoadingService {
-    startAnim() { }
-    stop() { }
-    waiting() { }
-}
-
 describe('AlarmTableComponent', () => {
     let fs: FnService;
     let ar: MockActivatedRoute;
@@ -85,12 +71,11 @@
             imports: [BrowserAnimationsModule, FormsModule, RouterTestingModule],
             declarations: [
                 AlarmTableComponent, AlarmDetailsComponent,
-                IconComponent, TableFilterPipe
+                IconComponent, TableFilterPipe, LoadingComponent
              ],
             providers: [
                 { provide: FnService, useValue: fs },
                 { provide: LogService, useValue: logSpy },
-                { provide: LoadingService, useClass: MockLoadingService },
                 { provide: IconService, useClass: MockIconService },
                 { provide: 'Window', useValue: windowMock },
             ]
diff --git a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.ts b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.ts
index d2e46b2..548965d 100644
--- a/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.ts
+++ b/apps/faultmanagement/fm-gui2-lib/projects/fm-gui2-lib/src/lib/alarmtable/alarmtable.component.ts
@@ -17,7 +17,6 @@
 import { ActivatedRoute } from '@angular/router';
 import {
     FnService,
-    LoadingService,
     LogService,
     WebSocketService,
     SortDir, TableBaseImpl, TableResponse
@@ -85,11 +84,10 @@
         private route: ActivatedRoute,
         @Inject('Window') private w: any,
         protected log: LogService,
-        protected ls: LoadingService,
         protected fs: FnService,
         protected wss: WebSocketService,
     ) {
-        super(fs, ls, log, wss, 'alarmTable');
+        super(fs, log, wss, 'alarmTable');
 
         this.route.queryParams.subscribe(params => {
             this.devId = params['devId'];