diff --git a/Loop/Base.lproj/Main.storyboard b/Loop/Base.lproj/Main.storyboard
index 9b3583fa92..7389695acf 100644
--- a/Loop/Base.lproj/Main.storyboard
+++ b/Loop/Base.lproj/Main.storyboard
@@ -18,7 +18,7 @@
                         <color key="backgroundColor" red="0.93725490199999995" green="0.93725490199999995" blue="0.95686274510000002" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                         <prototypes>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="none" indentationWidth="10" reuseIdentifier="SwitchTableViewCell" id="vah-ss-3Ud" customClass="SwitchTableViewCell" customModule="Loop" customModuleProvider="target">
-                                <rect key="frame" x="0.0" y="119.5" width="320" height="44"/>
+                                <rect key="frame" x="0.0" y="120" width="320" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="vah-ss-3Ud" id="D0A-EB-kmz">
                                     <frame key="frameInset" width="320" height="43"/>
@@ -46,21 +46,21 @@
                                 </connections>
                             </tableViewCell>
                             <tableViewCell clipsSubviews="YES" contentMode="scaleToFill" selectionStyle="default" accessoryType="disclosureIndicator" indentationWidth="10" reuseIdentifier="ConfigTableViewCell" textLabel="5TX-kX-nBo" detailTextLabel="m9c-SQ-djE" style="IBUITableViewCellStyleValue1" id="0EG-OG-YuT">
-                                <rect key="frame" x="0.0" y="163.5" width="320" height="44"/>
+                                <rect key="frame" x="0.0" y="164" width="320" height="44"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="0EG-OG-YuT" id="af2-sZ-CY0">
-                                    <frame key="frameInset" width="287" height="43.5"/>
+                                    <frame key="frameInset" width="287" height="43"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Pump ID" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="5TX-kX-nBo">
-                                            <frame key="frameInset" minX="15" minY="12" width="65" height="20.5"/>
+                                            <frame key="frameInset" minX="15" minY="11" width="65" height="21"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
                                             <nil key="highlightedColor"/>
                                         </label>
                                         <label opaque="NO" multipleTouchEnabled="YES" contentMode="left" text="Tap to set" textAlignment="right" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" id="m9c-SQ-djE">
-                                            <frame key="frameInset" minX="209" minY="12" width="76" height="20.5"/>
+                                            <frame key="frameInset" minX="209" minY="11" width="76" height="21"/>
                                             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                                             <fontDescription key="fontDescription" style="UICTFontTextStyleBody"/>
                                             <color key="textColor" red="0.55676333109537768" green="0.55676333109537768" blue="0.55676333109537768" alpha="1" colorSpace="custom" customColorSpace="sRGB"/>
@@ -123,7 +123,7 @@
                                 <rect key="frame" x="0.0" y="92" width="320" height="270"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="mQk-9D-0ub" id="B1i-Pw-wSw">
-                                    <frame key="frameInset" width="320" height="269.5"/>
+                                    <frame key="frameInset" width="320" height="269"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="FBL-RL-faM" customClass="ChartContentView" customModule="Loop" customModuleProvider="target">
@@ -165,7 +165,7 @@
                                 <rect key="frame" x="0.0" y="362" width="320" height="64"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="Xc2-a9-ojZ" id="a4h-tq-Rnl">
-                                    <frame key="frameInset" width="320" height="63.5"/>
+                                    <frame key="frameInset" width="320" height="63"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" verticalCompressionResistancePriority="751" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="bIL-Ub-qYp">
@@ -197,7 +197,7 @@
                                 <rect key="frame" x="0.0" y="426" width="320" height="64"/>
                                 <autoresizingMask key="autoresizingMask"/>
                                 <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="I71-cY-0y7" id="0f9-ja-YFt">
-                                    <frame key="frameInset" width="320" height="63.5"/>
+                                    <frame key="frameInset" width="320" height="63"/>
                                     <autoresizingMask key="autoresizingMask"/>
                                     <subviews>
                                         <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="249" verticalHuggingPriority="252" text="Title" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="zbc-87-wxZ">
@@ -662,7 +662,7 @@
                                         <rect key="frame" x="0.0" y="99" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="DoN-m5-O7j" id="3OB-7U-Jvb">
-                                            <frame key="frameInset" width="320" height="43.5"/>
+                                            <frame key="frameInset" width="320" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Recommended" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="ywT-OR-NnU">
@@ -704,7 +704,7 @@
                                         <rect key="frame" x="0.0" y="143" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="us0-UE-Wqz" id="2fI-OE-GLU">
-                                            <frame key="frameInset" width="320" height="43.5"/>
+                                            <frame key="frameInset" width="320" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" verticalHuggingPriority="251" text="Bolus" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="5oA-6d-ZTL">
@@ -745,7 +745,7 @@
                                         <rect key="frame" x="0.0" y="187" width="320" height="44"/>
                                         <autoresizingMask key="autoresizingMask"/>
                                         <tableViewCellContentView key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" tableViewCell="efV-tT-gC9" id="nq8-dv-ceA">
-                                            <frame key="frameInset" width="320" height="43.5"/>
+                                            <frame key="frameInset" width="320" height="43"/>
                                             <autoresizingMask key="autoresizingMask"/>
                                             <subviews>
                                                 <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="Ya0-9b-ZAS">
diff --git a/Loop/Models/Glucose.swift b/Loop/Models/Glucose.swift
index 4907322953..0ae2ca0cb1 100644
--- a/Loop/Models/Glucose.swift
+++ b/Loop/Models/Glucose.swift
@@ -51,4 +51,8 @@ extension Glucose: SensorDisplayable {
             return .upUpUp
         }
     }
+
+    var isLocal: Bool {
+        return true
+    }
 }
diff --git a/Loop/Models/GlucoseG4.swift b/Loop/Models/GlucoseG4.swift
index da4603c138..30df44498d 100644
--- a/Loop/Models/GlucoseG4.swift
+++ b/Loop/Models/GlucoseG4.swift
@@ -39,4 +39,8 @@ extension GlucoseG4: SensorDisplayable {
     var trendType: GlucoseTrend? {
         return GlucoseTrend(rawValue: Int(trend))
     }
+
+    var isLocal: Bool {
+        return true
+    }
 }
diff --git a/Loop/Models/MySentryPumpStatusMessageBody.swift b/Loop/Models/MySentryPumpStatusMessageBody.swift
index f2ce8a911d..253a0423e7 100644
--- a/Loop/Models/MySentryPumpStatusMessageBody.swift
+++ b/Loop/Models/MySentryPumpStatusMessageBody.swift
@@ -38,4 +38,8 @@ extension MySentryPumpStatusMessageBody: SensorDisplayable {
             return .flat
         }
     }
+
+    var isLocal: Bool {
+        return true
+    }
 }
diff --git a/Loop/Models/SensorDisplayable.swift b/Loop/Models/SensorDisplayable.swift
index 7cf7723110..f71838e3dd 100644
--- a/Loop/Models/SensorDisplayable.swift
+++ b/Loop/Models/SensorDisplayable.swift
@@ -18,6 +18,9 @@ protocol SensorDisplayable {
 
     /// Enumerates the trend of the sensor values
     var trendType: GlucoseTrend? { get }
+
+    /// Returns wheter the data is from a locally-connected device
+    var isLocal: Bool { get }
 }
 
 
diff --git a/Loop/Models/ShareGlucose+GlucoseKit.swift b/Loop/Models/ShareGlucose+GlucoseKit.swift
index 0d1ab5746d..7aad5740e9 100644
--- a/Loop/Models/ShareGlucose+GlucoseKit.swift
+++ b/Loop/Models/ShareGlucose+GlucoseKit.swift
@@ -31,4 +31,8 @@ extension ShareGlucose: SensorDisplayable {
     var trendType: GlucoseTrend? {
         return GlucoseTrend(rawValue: Int(trend))
     }
+
+    var isLocal: Bool {
+        return false
+    }
 }
diff --git a/Loop/View Controllers/PredictionTableViewController.swift b/Loop/View Controllers/PredictionTableViewController.swift
index a5a0568d3d..ba16d503dd 100644
--- a/Loop/View Controllers/PredictionTableViewController.swift	
+++ b/Loop/View Controllers/PredictionTableViewController.swift	
@@ -300,7 +300,7 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass, U
             if let eventualGlucose = eventualGlucoseDescription {
                 cell.titleLabel?.text = String(format: NSLocalizedString("Eventually %@", comment: "The subtitle format describing eventual glucose. (1: localized glucose value description)"), eventualGlucose)
             } else {
-                cell.titleLabel?.text = nil
+                cell.titleLabel?.text = "–"
             }
         default:
             break
@@ -321,7 +321,7 @@ class PredictionTableViewController: UITableViewController, IdentifiableClass, U
     override func tableView(_ tableView: UITableView, estimatedHeightForRowAt indexPath: IndexPath) -> CGFloat {
         switch Section(rawValue: indexPath.section)! {
         case .charts:
-            return 270
+            return 275
         case .inputs, .settings:
             return 60
         }
diff --git a/Loop/Views/GlucoseHUDView.swift b/Loop/Views/GlucoseHUDView.swift
index 3fecce9c80..ce3c8e539f 100644
--- a/Loop/Views/GlucoseHUDView.swift
+++ b/Loop/Views/GlucoseHUDView.swift
@@ -37,6 +37,34 @@ final class GlucoseHUDView: HUDView {
         }
     }
 
+    private enum SensorAlertState {
+        case ok
+        case missing
+        case invalid
+        case remote
+    }
+
+    private var sensorAlertState = SensorAlertState.ok {
+        didSet {
+            var alertLabelAlpha: CGFloat = 1
+
+            switch sensorAlertState {
+            case .ok:
+                alertLabelAlpha = 0
+            case .missing, .invalid:
+                alertLabel.backgroundColor = UIColor.agingColor
+                alertLabel.text = "!"
+            case .remote:
+                alertLabel.backgroundColor = UIColor.unknownColor
+                alertLabel.text = "☁︎"
+            }
+
+            UIView.animate(withDuration: 0.25, animations: {
+                self.alertLabel.alpha = alertLabelAlpha
+            })
+        }
+    }
+
     func set(_ glucoseValue: GlucoseValue, for unit: HKUnit, from sensor: SensorDisplayable?) {
         var accessibilityStrings = [String]()
 
@@ -56,16 +84,19 @@ final class GlucoseHUDView: HUDView {
             accessibilityStrings.append(trend.localizedDescription)
         }
 
-        if sensor?.isStateValid == false {
+        if sensor == nil {
+            sensorAlertState = .missing
+        } else if sensor!.isStateValid == false {
+            sensorAlertState = .invalid
             accessibilityStrings.append(NSLocalizedString("Needs attention", comment: "Accessibility label component for glucose HUD describing an invalid state"))
+        } else if sensor!.isLocal == false {
+            sensorAlertState = .remote
+        } else {
+            sensorAlertState = .ok
         }
 
         unitLabel.text = unitStrings.joined(separator: " ")
         accessibilityValue = accessibilityStrings.joined(separator: ", ")
-
-        UIView.animate(withDuration: 0.25, animations: { 
-            self.alertLabel.alpha = sensor?.isStateValid == true ? 0 : 1
-        }) 
     }
 
     private lazy var timeFormatter: DateFormatter = {