diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/topology/topology.component.html b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/topology/topology.component.html
index 7381a42..019c0d6 100644
--- a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/topology/topology.component.html
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/topology/topology.component.html
@@ -115,6 +115,7 @@
                    [deviceLabelToggle]="prefsState.dlbls"
                    [hostLabelToggle]="prefsState.hlbls"
                    [showHosts]="prefsState.hosts"
+                   [showAlarms]="prefsState.alarms"
                    [highlightPorts]="prefsState.porthl"
                    [scale]="window.innerHeight / (window.innerWidth * zoomDirective?.zoomCached.sc)"
                    (selectedNodeEvent)="nodeSelected($event)">
diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/topology/topology.component.spec.ts b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/topology/topology.component.spec.ts
index ba99fc8..15c2bd1 100644
--- a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/topology/topology.component.spec.ts
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/topology/topology.component.spec.ts
@@ -51,6 +51,7 @@
 import {SubRegionNodeSvgComponent} from '../layer/forcesvg/visuals/subregionnodesvg/subregionnodesvg.component';
 import {HostNodeSvgComponent} from '../layer/forcesvg/visuals/hostnodesvg/hostnodesvg.component';
 import {LayoutService} from '../layout.service';
+import {BadgeSvgComponent} from '../layer/forcesvg/visuals/badgesvg/badgesvg.component';
 
 
 class MockActivatedRoute extends ActivatedRoute {
@@ -215,7 +216,8 @@
                 MapSelectorComponent,
                 BackgroundSvgComponent,
                 MapSvgComponent,
-                GridsvgComponent
+                GridsvgComponent,
+                BadgeSvgComponent
             ],
             providers: [
                 { provide: FnService, useValue: fs },
diff --git a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/topology/topology.component.ts b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/topology/topology.component.ts
index fb4e4cb..f48f33a 100644
--- a/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/topology/topology.component.ts
+++ b/web/gui2-topo-lib/projects/gui2-topo-lib/src/lib/topology/topology.component.ts
@@ -63,7 +63,8 @@
     PORTS_TOGGLE,
     QUICKHELP_BTN,
     RESETZOOM_BTN,
-    SUMMARY_TOGGLE
+    SUMMARY_TOGGLE,
+    ALARMS_TOGGLE
 } from '../panel/toolbar/toolbar.component';
 import {TrafficService, TrafficType} from '../traffic.service';
 import {ZoomableDirective} from '../layer/zoomable.directive';
@@ -88,6 +89,7 @@
 const PREF_TOOLBAR = 'toolbar';
 const PREF_PINNED = 'pinned';
 const PREF_TRAFFIC = 'traffic';
+const PREF_ALARMS = 'alarms';
 
 const BACKGROUND_ELEMENTS = [
     'svg topo2',
@@ -114,6 +116,7 @@
     grid: number;
     pinned: number;
     traffic: number;
+    alarms: number;
 }
 
 /**
@@ -171,7 +174,8 @@
         toolbar: 0,
         grid: 0,
         pinned: 0,
-        traffic: 2 // default to PORTSTATSPKTSEC, as it will iterate over to 0 on init
+        traffic: 2, // default to PORTSTATSPKTSEC, as it will iterate over to 0 on init
+        alarms: 1,
     };
 
     mapIdState: MapObject = <MapObject>{
@@ -436,6 +440,9 @@
             case LAYOUT_ACCESS_BTN:
                 this.layout.changeLayout(LayoutType.LAYOUT_ACCESS);
                 break;
+            case ALARMS_TOGGLE:
+                this.toggleAlarms();
+                break;
             default:
                 this.log.warn('Unhandled Toolbar action', name);
         }
@@ -659,6 +666,14 @@
         this.log.debug('toggling offline devices', this.prefsState.offdev);
     }
 
+
+    protected toggleAlarms() {
+        const on: boolean = !Boolean(this.prefsState.alarms);
+        this.flashMsg = this.lionFn(on ? 'show' : 'hide') + ' Alarms';
+        this.updatePrefsState(PREF_ALARMS, on ? 1 : 0);
+        this.log.debug('Alarms toggled', on);
+    }
+
     protected resetZoom() {
         const zoomMapExtents = ZoomUtils.zoomToWindowSize(
             this.bannerHeight, this.window.innerWidth, this.window.innerHeight);