diff --git a/src/components/IOC/IOCAlerts.js b/src/components/IOC/AlertMessages.js
similarity index 80%
rename from src/components/IOC/IOCAlerts.js
rename to src/components/IOC/AlertMessages.js
index 0d905075ba86327a754cdac5726f725f6dfc4ba3..8a9b1882a050d491200b20ef34ef1ee8a7b0a292 100644
--- a/src/components/IOC/IOCAlerts.js
+++ b/src/components/IOC/AlertMessages.js
@@ -2,10 +2,10 @@ import React from 'react';
 import { Grid } from "@material-ui/core";
 import { Alert } from "@material-ui/lab";
 
-export default function IOCAlerts({ioc}) {
+export default function AlertMessages({alerts}) {
   return (
     <Grid container spacing={1}>
-    {(ioc.alerts.map((alert) => (
+    {(alerts.map((alert) => (
       <Grid item xs={12} key={alert}>
         <Alert severity={alert.type === "ERROR" ? "error" : "warning"}>{alert.message}</Alert>
       </Grid>
diff --git a/src/components/IOC/IOCDetails.js b/src/components/IOC/IOCDetails.js
index 1a536d3c644725327ee614f7d75ba77d15e0f1be..f37af826ee73ba616ceb2115f20774259e69b4be 100644
--- a/src/components/IOC/IOCDetails.js
+++ b/src/components/IOC/IOCDetails.js
@@ -30,10 +30,12 @@ export function IOCDetails({ ioc, getSubset=defaultSubset, alert, buttons }) {
         </Grid>}
         <Grid item xs={12}>
           <Box display="flex" flexDirection="row-reverse" p={2} m={1}>
-            <AccessControl 
-              allowedRoles={["DeploymentToolAdmin, DeploymentToolIntegrator"]}
-              renderNoAccess={() =><></>}>
+            <AccessControl
+              allowedRoles={["DeploymentToolAdmin", "DeploymentToolIntegrator"]}
+              renderNoAccess={() => <> </>}>
+              <>
                 {buttons}
+              </>
             </AccessControl>
           </Box>
         </Grid>
diff --git a/src/components/IOC/IOCLiveStatus.js b/src/components/IOC/IOCLiveStatus.js
index d775b35e5fd075d3842de3cd67de3a463d6beb6a..ac0cec6633985c1781353fb92b564ecf72ba4d40 100644
--- a/src/components/IOC/IOCLiveStatus.js
+++ b/src/components/IOC/IOCLiveStatus.js
@@ -6,7 +6,7 @@ import { Link } from 'react-router-dom';
 import { LokiContainer } from "../common/Loki/LokiContainer";
 import { Alert } from '@material-ui/lab';
 import GitRefLink from "./GitRefLink";
-import IOCAlerts from "./IOCAlerts";
+import AlertMessages from "./AlertMessages";
 import { IOCService } from "./IOCService";
 import { IOCCommandTable } from "./IOCCommandTable";
 import AccessControl from '../../components/auth/AccessControl';
@@ -47,7 +47,7 @@ export function IOCLiveStatus({ ioc, currentCommand, commands, getCommands, butt
 
   return (
     <>
-      <IOCDetails ioc={liveIOC} getSubset={getSubset} alert={<IOCAlerts ioc={liveIOC} />} />
+      <IOCDetails ioc={liveIOC} getSubset={getSubset} alert={<AlertMessages alerts={liveIOC.alerts}/>}/>
       <SimpleAccordion summary="IOC Service Control log">
         <IOCCommandTable commands={commands}
           commandLazyParams={commandLazyParams} setCommandLazyParams={setCommandLazyParams} commandColumnSort={commandColumnSort} setCommandColumnSort={setCommandColumnSort}
diff --git a/src/components/IOC/IOCManage.js b/src/components/IOC/IOCManage.js
index 2e931a4651e7a8be274cf89afc0c057bac242a45..df4adc2b89faf7646bda3ccac83dab5982c251b2 100644
--- a/src/components/IOC/IOCManage.js
+++ b/src/components/IOC/IOCManage.js
@@ -6,7 +6,7 @@ import { UndeployIOC } from "../../components/IOC/UndeployIOC";
 import { SimpleModal } from "../../components/common/SimpleModal/SimpleModal";
 import { useUpdateAndDeployIoc, useCreateUndeployment, useDeploymentListForIOC } from "../../api/SwaggerApi";
 import GitRefLink from "./GitRefLink";
-import IOCAlerts from "./IOCAlerts";
+import AlertMessages from "./AlertMessages";
 import { Link } from 'react-router-dom';
 import { DeploymentsTable } from "../../components/deployments/DeploymentsTable";
 import { SimpleAccordion } from "../common/Accordion/SimpleAccordion";
@@ -133,7 +133,7 @@ export function IOCManage({ ioc, getIOC, buttonDisabled }) {
 
     content = (
       <>
-        <IOCDetails ioc={managedIOC} getSubset={getSubset} alert={<IOCAlerts ioc={managedIOC}/>}
+        <IOCDetails ioc={managedIOC} getSubset={getSubset} alert={<AlertMessages alerts={managedIOC.alerts}/>}
           buttons={
             <>
               <Tooltip title={disabledDebployButtonTitle}>
diff --git a/src/components/host/HostTable.js b/src/components/host/HostTable.js
index 8d56dd9295dafc3ad2e3fc94eb43f4026be1905f..092721055789a77a6a333d422376147f4708cd04 100644
--- a/src/components/host/HostTable.js
+++ b/src/components/host/HostTable.js
@@ -37,6 +37,8 @@ export function createRow(hostContainer) {
         network: host.network,
         deviceType: host.deviceType,
         scope: host.scope,
+        discrepancy: hostContainer.alert === "WARNING",
+        inconsistentState: hostContainer.alert === "ERROR",
         shortenLongData: true,
     };
 
diff --git a/src/views/host/HostDetailsView.js b/src/views/host/HostDetailsView.js
index 36e7768ad8ee00d85f4cec8d6b2dec116d4a16e3..86792097e559293d614bae811191ae72f4d328c3 100644
--- a/src/views/host/HostDetailsView.js
+++ b/src/views/host/HostDetailsView.js
@@ -23,6 +23,7 @@ import { formatDate, initRequestParams } from '../../components/common/Helper';
 import AccessControl from '../../components/auth/AccessControl';
 import { useGlobalAppBar } from '../../components/navigation/GlobalAppBar/GlobalAppBar';
 import { useHost } from "../../api/SwaggerApi";
+import AlertMessages from '../../components/IOC/AlertMessages';
 
 const useStyles = makeStyles((theme) => ({
     secondItem: {
@@ -85,6 +86,7 @@ export function HostDetailsView({ id}) {
                 <ArrowBackIcon />
             </IconButton>
             {host && <HostBadge host={host} />}
+            {host && <AlertMessages alerts={host.alerts}/>}
             <SimpleAccordion summary="Deployed IOCs" defaultExpanded>
                 <Hidden smUp>
                     <IOCList iocs={deployedIocs} loading={loading}/>