diff --git a/DoseMathTests/Info.plist b/DoseMathTests/Info.plist
index 12dfb7a8d3..31b423aaa3 100644
--- a/DoseMathTests/Info.plist
+++ b/DoseMathTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.11.1</string>
+	<string>0.12.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Loop.xcodeproj/project.pbxproj b/Loop.xcodeproj/project.pbxproj
index d7c9339b12..3f13bb5e01 100644
--- a/Loop.xcodeproj/project.pbxproj
+++ b/Loop.xcodeproj/project.pbxproj
@@ -140,6 +140,7 @@
 		43F78D4D1C914197002152D1 /* GlucoseKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D491C914197002152D1 /* GlucoseKit.framework */; };
 		43F78D4E1C914197002152D1 /* InsulinKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D4A1C914197002152D1 /* InsulinKit.framework */; };
 		43F78D4F1C914197002152D1 /* LoopKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 43F78D4B1C914197002152D1 /* LoopKit.framework */; };
+		43FBEDD81D73843700B21F22 /* LevelMaskView.swift in Sources */ = {isa = PBXBuildFile; fileRef = 43FBEDD71D73843700B21F22 /* LevelMaskView.swift */; };
 		4D3B40041D4A9E1A00BC6334 /* G4ShareSpy.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 4D3B40021D4A9DFE00BC6334 /* G4ShareSpy.framework */; };
 		4D5B7A4B1D457CCA00796CA9 /* GlucoseG4.swift in Sources */ = {isa = PBXBuildFile; fileRef = 4D5B7A4A1D457CCA00796CA9 /* GlucoseG4.swift */; };
 		C10428971D17BAD400DD539A /* NightscoutUploadKit.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */; };
@@ -365,6 +366,7 @@
 		43F78D491C914197002152D1 /* GlucoseKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = GlucoseKit.framework; path = Carthage/Build/iOS/GlucoseKit.framework; sourceTree = "<group>"; };
 		43F78D4A1C914197002152D1 /* InsulinKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = InsulinKit.framework; path = Carthage/Build/iOS/InsulinKit.framework; sourceTree = "<group>"; };
 		43F78D4B1C914197002152D1 /* LoopKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = LoopKit.framework; path = Carthage/Build/iOS/LoopKit.framework; sourceTree = "<group>"; };
+		43FBEDD71D73843700B21F22 /* LevelMaskView.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; path = LevelMaskView.swift; sourceTree = "<group>"; };
 		4D3B40021D4A9DFE00BC6334 /* G4ShareSpy.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = G4ShareSpy.framework; path = Carthage/Build/iOS/G4ShareSpy.framework; sourceTree = "<group>"; };
 		4D5B7A4A1D457CCA00796CA9 /* GlucoseG4.swift */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.swift; name = GlucoseG4.swift; path = Loop/Models/GlucoseG4.swift; sourceTree = SOURCE_ROOT; };
 		C10428961D17BAD400DD539A /* NightscoutUploadKit.framework */ = {isa = PBXFileReference; lastKnownFileType = wrapper.framework; name = NightscoutUploadKit.framework; path = Carthage/Build/iOS/NightscoutUploadKit.framework; sourceTree = "<group>"; };
@@ -648,6 +650,7 @@
 				4346D1E61C77F5FE00ABAFE3 /* ChartTableViewCell.swift */,
 				4337615E1D52F487004A3647 /* GlucoseHUDView.swift */,
 				437CEEBB1CD6DE6A003C8C80 /* HUDView.swift */,
+				43FBEDD71D73843700B21F22 /* LevelMaskView.swift */,
 				437CEEBD1CD6E0CB003C8C80 /* LoopCompletionHUDView.swift */,
 				438DADC71CDE8F8B007697A5 /* LoopStateView.swift */,
 				437CEEC71CD84CBB003C8C80 /* ReservoirVolumeHUDView.swift */,
@@ -1031,6 +1034,7 @@
 				43F41C371D3BF32400C11ED6 /* UIAlertController.swift in Sources */,
 				437CEEBC1CD6DE6A003C8C80 /* HUDView.swift in Sources */,
 				434F545F1D288345002A9274 /* ShareService.swift in Sources */,
+				43FBEDD81D73843700B21F22 /* LevelMaskView.swift in Sources */,
 				4354003A1C9FB81100D5819C /* UIColor.swift in Sources */,
 				4328E0331CFC091100E199AA /* WatchContext+LoopKit.swift in Sources */,
 				4398973B1CD2FC2000223065 /* NSDateFormatter.swift in Sources */,
diff --git a/Loop/Assets.xcassets/battery/battery.imageset/Contents.json b/Loop/Assets.xcassets/battery/battery.imageset/Contents.json
new file mode 100644
index 0000000000..898b4aa559
--- /dev/null
+++ b/Loop/Assets.xcassets/battery/battery.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "battery.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/Loop/Assets.xcassets/battery/battery.imageset/battery.pdf b/Loop/Assets.xcassets/battery/battery.imageset/battery.pdf
new file mode 100644
index 0000000000..ca8bffbb67
Binary files /dev/null and b/Loop/Assets.xcassets/battery/battery.imageset/battery.pdf differ
diff --git a/Loop/Assets.xcassets/battery/battery_0.imageset/Contents.json b/Loop/Assets.xcassets/battery/battery_0.imageset/Contents.json
deleted file mode 100644
index 3946374283..0000000000
--- a/Loop/Assets.xcassets/battery/battery_0.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "battery_0@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Loop/Assets.xcassets/battery/battery_0.imageset/battery_0@2x.png b/Loop/Assets.xcassets/battery/battery_0.imageset/battery_0@2x.png
deleted file mode 100644
index 09e2ebfd7d..0000000000
Binary files a/Loop/Assets.xcassets/battery/battery_0.imageset/battery_0@2x.png and /dev/null differ
diff --git a/Loop/Assets.xcassets/battery/battery_100.imageset/Contents.json b/Loop/Assets.xcassets/battery/battery_100.imageset/Contents.json
deleted file mode 100644
index 89e1fb18ce..0000000000
--- a/Loop/Assets.xcassets/battery/battery_100.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "battery_100@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Loop/Assets.xcassets/battery/battery_100.imageset/battery_100@2x.png b/Loop/Assets.xcassets/battery/battery_100.imageset/battery_100@2x.png
deleted file mode 100644
index 37ad1a6f6d..0000000000
Binary files a/Loop/Assets.xcassets/battery/battery_100.imageset/battery_100@2x.png and /dev/null differ
diff --git a/Loop/Assets.xcassets/battery/battery_25.imageset/Contents.json b/Loop/Assets.xcassets/battery/battery_25.imageset/Contents.json
deleted file mode 100644
index d55cea55b9..0000000000
--- a/Loop/Assets.xcassets/battery/battery_25.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "battery_25@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Loop/Assets.xcassets/battery/battery_25.imageset/battery_25@2x.png b/Loop/Assets.xcassets/battery/battery_25.imageset/battery_25@2x.png
deleted file mode 100644
index 0e72d46235..0000000000
Binary files a/Loop/Assets.xcassets/battery/battery_25.imageset/battery_25@2x.png and /dev/null differ
diff --git a/Loop/Assets.xcassets/battery/battery_50.imageset/Contents.json b/Loop/Assets.xcassets/battery/battery_50.imageset/Contents.json
deleted file mode 100644
index 08fd5a46b6..0000000000
--- a/Loop/Assets.xcassets/battery/battery_50.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "battery_50@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Loop/Assets.xcassets/battery/battery_50.imageset/battery_50@2x.png b/Loop/Assets.xcassets/battery/battery_50.imageset/battery_50@2x.png
deleted file mode 100644
index 05b2bdaf21..0000000000
Binary files a/Loop/Assets.xcassets/battery/battery_50.imageset/battery_50@2x.png and /dev/null differ
diff --git a/Loop/Assets.xcassets/battery/battery_75.imageset/Contents.json b/Loop/Assets.xcassets/battery/battery_75.imageset/Contents.json
deleted file mode 100644
index 8b58057f79..0000000000
--- a/Loop/Assets.xcassets/battery/battery_75.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "battery_75@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Loop/Assets.xcassets/battery/battery_75.imageset/battery_75@2x.png b/Loop/Assets.xcassets/battery/battery_75.imageset/battery_75@2x.png
deleted file mode 100644
index 8bf86a19b3..0000000000
Binary files a/Loop/Assets.xcassets/battery/battery_75.imageset/battery_75@2x.png and /dev/null differ
diff --git a/Loop/Assets.xcassets/battery/battery_mask.imageset/Contents.json b/Loop/Assets.xcassets/battery/battery_mask.imageset/Contents.json
new file mode 100644
index 0000000000..a089e35498
--- /dev/null
+++ b/Loop/Assets.xcassets/battery/battery_mask.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "battery_mask.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Loop/Assets.xcassets/battery/battery_mask.imageset/battery_mask.pdf b/Loop/Assets.xcassets/battery/battery_mask.imageset/battery_mask.pdf
new file mode 100644
index 0000000000..a580753697
Binary files /dev/null and b/Loop/Assets.xcassets/battery/battery_mask.imageset/battery_mask.pdf differ
diff --git a/Loop/Assets.xcassets/battery/battery_unknown.imageset/Contents.json b/Loop/Assets.xcassets/battery/battery_unknown.imageset/Contents.json
deleted file mode 100644
index 1e0bfe994d..0000000000
--- a/Loop/Assets.xcassets/battery/battery_unknown.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "battery_unknown@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Loop/Assets.xcassets/battery/battery_unknown.imageset/battery_unknown@2x.png b/Loop/Assets.xcassets/battery/battery_unknown.imageset/battery_unknown@2x.png
deleted file mode 100644
index a778ae850c..0000000000
Binary files a/Loop/Assets.xcassets/battery/battery_unknown.imageset/battery_unknown@2x.png and /dev/null differ
diff --git a/Loop/Assets.xcassets/bolus.imageset/bolus.pdf b/Loop/Assets.xcassets/bolus.imageset/bolus.pdf
index 7ac8d44d76..c9e69b5cfc 100644
Binary files a/Loop/Assets.xcassets/bolus.imageset/bolus.pdf and b/Loop/Assets.xcassets/bolus.imageset/bolus.pdf differ
diff --git a/Loop/Assets.xcassets/carbs.imageset/carbs.pdf b/Loop/Assets.xcassets/carbs.imageset/carbs.pdf
index 0fce5ebd16..327ec631b5 100644
Binary files a/Loop/Assets.xcassets/carbs.imageset/carbs.pdf and b/Loop/Assets.xcassets/carbs.imageset/carbs.pdf differ
diff --git a/Loop/Assets.xcassets/reservoir/reservoir.imageset/Contents.json b/Loop/Assets.xcassets/reservoir/reservoir.imageset/Contents.json
new file mode 100644
index 0000000000..aba98e7f10
--- /dev/null
+++ b/Loop/Assets.xcassets/reservoir/reservoir.imageset/Contents.json
@@ -0,0 +1,15 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "reservoir.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
+  }
+}
\ No newline at end of file
diff --git a/Loop/Assets.xcassets/reservoir/reservoir.imageset/reservoir.pdf b/Loop/Assets.xcassets/reservoir/reservoir.imageset/reservoir.pdf
new file mode 100644
index 0000000000..9f1765ba9b
Binary files /dev/null and b/Loop/Assets.xcassets/reservoir/reservoir.imageset/reservoir.pdf differ
diff --git a/Loop/Assets.xcassets/reservoir/reservoir_0.imageset/Contents.json b/Loop/Assets.xcassets/reservoir/reservoir_0.imageset/Contents.json
deleted file mode 100644
index 795a5ba302..0000000000
--- a/Loop/Assets.xcassets/reservoir/reservoir_0.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "reservoir_0@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Loop/Assets.xcassets/reservoir/reservoir_0.imageset/reservoir_0@2x.png b/Loop/Assets.xcassets/reservoir/reservoir_0.imageset/reservoir_0@2x.png
deleted file mode 100644
index 75faceec7e..0000000000
Binary files a/Loop/Assets.xcassets/reservoir/reservoir_0.imageset/reservoir_0@2x.png and /dev/null differ
diff --git a/Loop/Assets.xcassets/reservoir/reservoir_100.imageset/Contents.json b/Loop/Assets.xcassets/reservoir/reservoir_100.imageset/Contents.json
deleted file mode 100644
index bb4d75e814..0000000000
--- a/Loop/Assets.xcassets/reservoir/reservoir_100.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "reservoir_100@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Loop/Assets.xcassets/reservoir/reservoir_100.imageset/reservoir_100@2x.png b/Loop/Assets.xcassets/reservoir/reservoir_100.imageset/reservoir_100@2x.png
deleted file mode 100644
index d7504b87de..0000000000
Binary files a/Loop/Assets.xcassets/reservoir/reservoir_100.imageset/reservoir_100@2x.png and /dev/null differ
diff --git a/Loop/Assets.xcassets/reservoir/reservoir_25.imageset/Contents.json b/Loop/Assets.xcassets/reservoir/reservoir_25.imageset/Contents.json
deleted file mode 100644
index 3e8bde606f..0000000000
--- a/Loop/Assets.xcassets/reservoir/reservoir_25.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "reservoir_25@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Loop/Assets.xcassets/reservoir/reservoir_25.imageset/reservoir_25@2x.png b/Loop/Assets.xcassets/reservoir/reservoir_25.imageset/reservoir_25@2x.png
deleted file mode 100644
index d8bdee37d4..0000000000
Binary files a/Loop/Assets.xcassets/reservoir/reservoir_25.imageset/reservoir_25@2x.png and /dev/null differ
diff --git a/Loop/Assets.xcassets/reservoir/reservoir_50.imageset/Contents.json b/Loop/Assets.xcassets/reservoir/reservoir_50.imageset/Contents.json
deleted file mode 100644
index 5e0ee1539b..0000000000
--- a/Loop/Assets.xcassets/reservoir/reservoir_50.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "reservoir_50@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Loop/Assets.xcassets/reservoir/reservoir_50.imageset/reservoir_50@2x.png b/Loop/Assets.xcassets/reservoir/reservoir_50.imageset/reservoir_50@2x.png
deleted file mode 100644
index 4be21f0d3d..0000000000
Binary files a/Loop/Assets.xcassets/reservoir/reservoir_50.imageset/reservoir_50@2x.png and /dev/null differ
diff --git a/Loop/Assets.xcassets/reservoir/reservoir_75.imageset/Contents.json b/Loop/Assets.xcassets/reservoir/reservoir_75.imageset/Contents.json
deleted file mode 100644
index c409f7a5ca..0000000000
--- a/Loop/Assets.xcassets/reservoir/reservoir_75.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "reservoir_75@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Loop/Assets.xcassets/reservoir/reservoir_75.imageset/reservoir_75@2x.png b/Loop/Assets.xcassets/reservoir/reservoir_75.imageset/reservoir_75@2x.png
deleted file mode 100644
index 296b4b5927..0000000000
Binary files a/Loop/Assets.xcassets/reservoir/reservoir_75.imageset/reservoir_75@2x.png and /dev/null differ
diff --git a/Loop/Assets.xcassets/reservoir/reservoir_mask.imageset/Contents.json b/Loop/Assets.xcassets/reservoir/reservoir_mask.imageset/Contents.json
new file mode 100644
index 0000000000..98eba73895
--- /dev/null
+++ b/Loop/Assets.xcassets/reservoir/reservoir_mask.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "idiom" : "universal",
+      "filename" : "reservoir_mask.pdf"
+    }
+  ],
+  "info" : {
+    "version" : 1,
+    "author" : "xcode"
+  }
+}
\ No newline at end of file
diff --git a/Loop/Assets.xcassets/reservoir/reservoir_mask.imageset/reservoir_mask.pdf b/Loop/Assets.xcassets/reservoir/reservoir_mask.imageset/reservoir_mask.pdf
new file mode 100644
index 0000000000..3d53399171
Binary files /dev/null and b/Loop/Assets.xcassets/reservoir/reservoir_mask.imageset/reservoir_mask.pdf differ
diff --git a/Loop/Assets.xcassets/reservoir/reservoir_unknown.imageset/Contents.json b/Loop/Assets.xcassets/reservoir/reservoir_unknown.imageset/Contents.json
deleted file mode 100644
index 3d3207a1e5..0000000000
--- a/Loop/Assets.xcassets/reservoir/reservoir_unknown.imageset/Contents.json
+++ /dev/null
@@ -1,21 +0,0 @@
-{
-  "images" : [
-    {
-      "idiom" : "universal",
-      "scale" : "1x"
-    },
-    {
-      "idiom" : "universal",
-      "filename" : "reservoir_unknown@2x.png",
-      "scale" : "2x"
-    },
-    {
-      "idiom" : "universal",
-      "scale" : "3x"
-    }
-  ],
-  "info" : {
-    "version" : 1,
-    "author" : "xcode"
-  }
-}
\ No newline at end of file
diff --git a/Loop/Assets.xcassets/reservoir/reservoir_unknown.imageset/reservoir_unknown@2x.png b/Loop/Assets.xcassets/reservoir/reservoir_unknown.imageset/reservoir_unknown@2x.png
deleted file mode 100644
index a8bbec8e99..0000000000
Binary files a/Loop/Assets.xcassets/reservoir/reservoir_unknown.imageset/reservoir_unknown@2x.png and /dev/null differ
diff --git a/Loop/Assets.xcassets/workout-selected.imageset/workout-selected.pdf b/Loop/Assets.xcassets/workout-selected.imageset/workout-selected.pdf
index 72e1512efe..a340acb01d 100644
Binary files a/Loop/Assets.xcassets/workout-selected.imageset/workout-selected.pdf and b/Loop/Assets.xcassets/workout-selected.imageset/workout-selected.pdf differ
diff --git a/Loop/Assets.xcassets/workout.imageset/workout.pdf b/Loop/Assets.xcassets/workout.imageset/workout.pdf
index e38a00b918..251c7b3b3c 100644
Binary files a/Loop/Assets.xcassets/workout.imageset/workout.pdf and b/Loop/Assets.xcassets/workout.imageset/workout.pdf differ
diff --git a/Loop/Base.lproj/Main.storyboard b/Loop/Base.lproj/Main.storyboard
index d05544f82c..3f53ea76bf 100644
--- a/Loop/Base.lproj/Main.storyboard
+++ b/Loop/Base.lproj/Main.storyboard
@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="no"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="74s-IX-WF0">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.Storyboard.XIB" version="3.0" toolsVersion="10117" systemVersion="15G1004" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" initialViewController="74s-IX-WF0">
     <dependencies>
         <deployment identifier="iOS"/>
         <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="10085"/>
@@ -155,7 +155,7 @@
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="4 min ago" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="krM-Ky-OTb">
                                                     <rect key="frame" x="0.0" y="56" width="120" height="13.5"/>
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
@@ -196,19 +196,19 @@
                                             <rect key="frame" x="120" y="0.0" width="120" height="70"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10:09 AM" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DKc-Kc-dgR">
-                                                    <rect key="frame" x="0.0" y="56" width="120" height="14"/>
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
+                                                    <rect key="frame" x="0.0" y="57" width="120" height="13"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" text="mmol/L ↗︎" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="kbE-jN-1cR">
-                                                    <rect key="frame" x="0.0" y="40.5" width="120" height="15.5"/>
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
+                                                    <rect key="frame" x="0.0" y="40" width="120" height="16.5"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="252" text="399" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="01f-Du-MVi">
-                                                    <rect key="frame" x="0.0" y="5" width="120" height="32.5"/>
+                                                    <rect key="frame" x="0.0" y="8" width="120" height="32.5"/>
                                                     <fontDescription key="fontDescription" type="system" weight="light" pointSize="27"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
@@ -220,15 +220,15 @@
                                                 <bool key="isElement" value="YES"/>
                                             </accessibility>
                                             <constraints>
-                                                <constraint firstItem="DKc-Kc-dgR" firstAttribute="top" secondItem="kbE-jN-1cR" secondAttribute="bottom" id="9cW-4R-GGV"/>
+                                                <constraint firstItem="DKc-Kc-dgR" firstAttribute="top" secondItem="kbE-jN-1cR" secondAttribute="bottom" constant="1" id="9cW-4R-GGV"/>
                                                 <constraint firstAttribute="trailing" secondItem="01f-Du-MVi" secondAttribute="trailing" id="EbP-QZ-v2O"/>
                                                 <constraint firstItem="DKc-Kc-dgR" firstAttribute="leading" secondItem="hJo-df-An0" secondAttribute="leading" id="LaF-v9-myA"/>
                                                 <constraint firstItem="01f-Du-MVi" firstAttribute="leading" secondItem="hJo-df-An0" secondAttribute="leading" id="U9a-jl-mu7"/>
-                                                <constraint firstItem="01f-Du-MVi" firstAttribute="top" secondItem="hJo-df-An0" secondAttribute="top" constant="5" id="axM-gE-UZC"/>
+                                                <constraint firstItem="01f-Du-MVi" firstAttribute="top" secondItem="hJo-df-An0" secondAttribute="top" constant="8" id="axM-gE-UZC"/>
                                                 <constraint firstAttribute="trailing" secondItem="kbE-jN-1cR" secondAttribute="trailing" id="mtr-Xt-FOr"/>
                                                 <constraint firstItem="kbE-jN-1cR" firstAttribute="leading" secondItem="hJo-df-An0" secondAttribute="leading" id="nOa-rB-64f"/>
                                                 <constraint firstAttribute="trailing" secondItem="DKc-Kc-dgR" secondAttribute="trailing" id="quK-zK-YMg"/>
-                                                <constraint firstItem="kbE-jN-1cR" firstAttribute="top" secondItem="01f-Du-MVi" secondAttribute="bottom" constant="3" id="x4b-cC-yX5"/>
+                                                <constraint firstItem="kbE-jN-1cR" firstAttribute="top" secondItem="01f-Du-MVi" secondAttribute="bottom" constant="-1" id="x4b-cC-yX5"/>
                                                 <constraint firstAttribute="bottom" secondItem="DKc-Kc-dgR" secondAttribute="bottom" id="ygo-QQ-xlW"/>
                                             </constraints>
                                             <connections>
@@ -241,14 +241,14 @@
                                             <rect key="frame" x="240" y="0.0" width="120" height="70"/>
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="-0.85 U" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Xq9-7P-H39">
-                                                    <rect key="frame" x="0.0" y="42" width="120" height="14"/>
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
+                                                    <rect key="frame" x="0.0" y="41" width="120" height="14"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10:09 AM" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="Wkb-m1-PVZ">
                                                     <rect key="frame" x="0.0" y="56" width="120" height="14"/>
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
@@ -267,8 +267,8 @@
                                             <constraints>
                                                 <constraint firstAttribute="trailing" secondItem="Wkb-m1-PVZ" secondAttribute="trailing" id="20s-OF-j7K"/>
                                                 <constraint firstItem="AbR-sM-aVG" firstAttribute="top" secondItem="BEG-xe-e6y" secondAttribute="top" constant="8" id="5Un-T7-Hcy"/>
-                                                <constraint firstItem="Wkb-m1-PVZ" firstAttribute="top" secondItem="Xq9-7P-H39" secondAttribute="bottom" id="5rR-ne-019"/>
-                                                <constraint firstItem="Xq9-7P-H39" firstAttribute="top" secondItem="AbR-sM-aVG" secondAttribute="bottom" constant="4" id="HHd-OV-lqu"/>
+                                                <constraint firstItem="Wkb-m1-PVZ" firstAttribute="top" secondItem="Xq9-7P-H39" secondAttribute="bottom" constant="1" id="5rR-ne-019"/>
+                                                <constraint firstItem="Xq9-7P-H39" firstAttribute="top" secondItem="AbR-sM-aVG" secondAttribute="bottom" constant="3" id="HHd-OV-lqu"/>
                                                 <constraint firstItem="Xq9-7P-H39" firstAttribute="leading" secondItem="BEG-xe-e6y" secondAttribute="leading" id="Hff-S0-y4l"/>
                                                 <constraint firstItem="Xq9-7P-H39" firstAttribute="trailing" secondItem="BEG-xe-e6y" secondAttribute="trailing" id="NeL-I4-N2U"/>
                                                 <constraint firstAttribute="bottom" secondItem="Wkb-m1-PVZ" secondAttribute="bottom" id="YV3-BA-seT"/>
@@ -284,26 +284,44 @@
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="uVa-hu-HBZ" customClass="ReservoirVolumeHUDView" customModule="Loop" customModuleProvider="target">
                                             <rect key="frame" x="360" y="0.0" width="120" height="70"/>
                                             <subviews>
-                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="164.3 U" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TfZ-En-Kls">
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="10:09 AM" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="TfZ-En-Kls">
                                                     <rect key="frame" x="0.0" y="56" width="120" height="14"/>
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
-                                                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GZe-78-E6L">
-                                                    <rect key="frame" x="38" y="8" width="44" height="44"/>
+                                                <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="GZe-78-E6L">
+                                                    <rect key="frame" x="38" y="9" width="44" height="44"/>
                                                     <subviews>
-                                                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="reservoir_unknown" translatesAutoresizingMaskIntoConstraints="NO" id="RlS-oc-BER">
-                                                            <rect key="frame" x="8" y="0.0" width="27" height="44"/>
+                                                        <imageView userInteractionEnabled="NO" contentMode="center" horizontalHuggingPriority="251" verticalHuggingPriority="251" image="reservoir" translatesAutoresizingMaskIntoConstraints="NO" id="VyJ-Td-YSU">
+                                                            <rect key="frame" x="0.0" y="0.0" width="44" height="44"/>
                                                         </imageView>
+                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Mj6-Le-QLM" customClass="LevelMaskView" customModule="Loop" customModuleProvider="target">
+                                                            <rect key="frame" x="0.0" y="5" width="44" height="39"/>
+                                                            <userDefinedRuntimeAttributes>
+                                                                <userDefinedRuntimeAttribute type="image" keyPath="maskImage" value="reservoir_mask"/>
+                                                            </userDefinedRuntimeAttributes>
+                                                        </view>
                                                     </subviews>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <constraints>
-                                                        <constraint firstItem="RlS-oc-BER" firstAttribute="centerY" secondItem="GZe-78-E6L" secondAttribute="centerY" id="Phe-o7-U5N"/>
-                                                        <constraint firstItem="RlS-oc-BER" firstAttribute="centerX" secondItem="GZe-78-E6L" secondAttribute="centerX" id="TCA-8d-0Hy"/>
-                                                        <constraint firstAttribute="width" secondItem="GZe-78-E6L" secondAttribute="height" multiplier="1:1" id="WyP-cD-3dJ"/>
+                                                        <constraint firstItem="VyJ-Td-YSU" firstAttribute="leading" secondItem="GZe-78-E6L" secondAttribute="leading" id="6xU-89-LM0"/>
+                                                        <constraint firstAttribute="width" constant="44" id="CkT-Ov-JPo"/>
+                                                        <constraint firstAttribute="trailing" secondItem="Mj6-Le-QLM" secondAttribute="trailing" id="ERh-S3-GyG"/>
+                                                        <constraint firstAttribute="bottom" secondItem="Mj6-Le-QLM" secondAttribute="bottom" id="HyU-xh-Qf5"/>
+                                                        <constraint firstItem="Mj6-Le-QLM" firstAttribute="leading" secondItem="GZe-78-E6L" secondAttribute="leading" id="Rel-8J-aqt"/>
+                                                        <constraint firstItem="VyJ-Td-YSU" firstAttribute="top" secondItem="GZe-78-E6L" secondAttribute="top" id="dSI-Jr-N1o"/>
+                                                        <constraint firstAttribute="trailing" secondItem="VyJ-Td-YSU" secondAttribute="trailing" id="iQb-tc-SYd"/>
+                                                        <constraint firstItem="Mj6-Le-QLM" firstAttribute="top" secondItem="GZe-78-E6L" secondAttribute="top" constant="5" id="iQl-1V-Rh0"/>
+                                                        <constraint firstAttribute="height" constant="44" id="rkL-YZ-2qd"/>
+                                                        <constraint firstAttribute="bottom" secondItem="VyJ-Td-YSU" secondAttribute="bottom" id="xAR-JK-8XL"/>
                                                     </constraints>
                                                 </view>
+                                                <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="44U" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="I7M-3l-Pf0">
+                                                    <rect key="frame" x="48.5" y="28" width="23" height="14"/>
+                                                    <fontDescription key="fontDescription" type="system" weight="medium" pointSize="11"/>
+                                                    <nil key="highlightedColor"/>
+                                                </label>
                                             </subviews>
                                             <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                             <accessibility key="accessibilityConfiguration">
@@ -311,15 +329,18 @@
                                             </accessibility>
                                             <constraints>
                                                 <constraint firstItem="TfZ-En-Kls" firstAttribute="leading" secondItem="uVa-hu-HBZ" secondAttribute="leading" id="95H-Dr-Ehg"/>
+                                                <constraint firstItem="I7M-3l-Pf0" firstAttribute="centerY" secondItem="uVa-hu-HBZ" secondAttribute="centerY" id="OdE-yS-JL2"/>
                                                 <constraint firstAttribute="trailing" secondItem="TfZ-En-Kls" secondAttribute="trailing" id="fAL-fC-zik"/>
                                                 <constraint firstItem="GZe-78-E6L" firstAttribute="centerX" secondItem="uVa-hu-HBZ" secondAttribute="centerX" id="qSH-zd-WBL"/>
-                                                <constraint firstItem="TfZ-En-Kls" firstAttribute="top" secondItem="GZe-78-E6L" secondAttribute="bottom" constant="4" id="ruz-pB-ZfP"/>
-                                                <constraint firstItem="GZe-78-E6L" firstAttribute="top" secondItem="uVa-hu-HBZ" secondAttribute="top" constant="8" id="t3Y-xH-FUO"/>
+                                                <constraint firstItem="TfZ-En-Kls" firstAttribute="top" secondItem="GZe-78-E6L" secondAttribute="bottom" constant="3" id="ruz-pB-ZfP"/>
+                                                <constraint firstItem="GZe-78-E6L" firstAttribute="top" secondItem="uVa-hu-HBZ" secondAttribute="top" constant="9" id="t3Y-xH-FUO"/>
                                                 <constraint firstAttribute="bottom" secondItem="TfZ-En-Kls" secondAttribute="bottom" id="w81-hl-byv"/>
+                                                <constraint firstItem="I7M-3l-Pf0" firstAttribute="centerX" secondItem="uVa-hu-HBZ" secondAttribute="centerX" id="wVv-fP-p0K"/>
                                             </constraints>
                                             <connections>
                                                 <outlet property="caption" destination="TfZ-En-Kls" id="PiD-oF-kkF"/>
-                                                <outlet property="imageView" destination="RlS-oc-BER" id="Tsn-jY-XCq"/>
+                                                <outlet property="levelMaskView" destination="Mj6-Le-QLM" id="6F7-1I-zao"/>
+                                                <outlet property="volumeLabel" destination="I7M-3l-Pf0" id="lXd-qd-m3B"/>
                                             </connections>
                                         </view>
                                         <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="ecE-wE-iZx" customClass="BatteryLevelHUDView" customModule="Loop" customModuleProvider="target">
@@ -327,22 +348,33 @@
                                             <subviews>
                                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="100%" textAlignment="center" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsLetterSpacingToFitWidth="YES" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="LaA-uX-OgX">
                                                     <rect key="frame" x="0.0" y="56" width="120" height="14"/>
-                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption1"/>
+                                                    <fontDescription key="fontDescription" style="UICTFontTextStyleCaption2"/>
                                                     <color key="textColor" red="0.0" green="0.0" blue="0.0" alpha="1" colorSpace="calibratedRGB"/>
                                                     <nil key="highlightedColor"/>
                                                 </label>
                                                 <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="Jjc-jK-Vci">
-                                                    <rect key="frame" x="38" y="8" width="44" height="44"/>
+                                                    <rect key="frame" x="38" y="9" width="44" height="44"/>
                                                     <subviews>
-                                                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="battery_unknown" translatesAutoresizingMaskIntoConstraints="NO" id="b1s-XV-TWG">
-                                                            <rect key="frame" x="8" y="0.0" width="27" height="44"/>
+                                                        <imageView opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" image="battery" translatesAutoresizingMaskIntoConstraints="NO" id="b1s-XV-TWG">
+                                                            <rect key="frame" x="9" y="0.0" width="26" height="44"/>
                                                         </imageView>
+                                                        <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="lzt-pC-IWF" customClass="LevelMaskView" customModule="Loop" customModuleProvider="target">
+                                                            <rect key="frame" x="0.0" y="2" width="44" height="42"/>
+                                                            <userDefinedRuntimeAttributes>
+                                                                <userDefinedRuntimeAttribute type="image" keyPath="maskImage" value="battery_mask"/>
+                                                            </userDefinedRuntimeAttributes>
+                                                        </view>
                                                     </subviews>
                                                     <color key="backgroundColor" white="1" alpha="1" colorSpace="calibratedWhite"/>
                                                     <constraints>
-                                                        <constraint firstAttribute="width" secondItem="Jjc-jK-Vci" secondAttribute="height" multiplier="1:1" id="WJg-UO-9Ir"/>
+                                                        <constraint firstAttribute="bottom" secondItem="lzt-pC-IWF" secondAttribute="bottom" id="0ws-od-exO"/>
+                                                        <constraint firstAttribute="width" constant="44" id="Aa9-jZ-kHQ"/>
+                                                        <constraint firstItem="lzt-pC-IWF" firstAttribute="leading" secondItem="Jjc-jK-Vci" secondAttribute="leading" id="Nzy-J6-c1N"/>
                                                         <constraint firstItem="b1s-XV-TWG" firstAttribute="centerX" secondItem="Jjc-jK-Vci" secondAttribute="centerX" id="bja-Pv-F38"/>
                                                         <constraint firstItem="b1s-XV-TWG" firstAttribute="centerY" secondItem="Jjc-jK-Vci" secondAttribute="centerY" id="fQm-zs-dL6"/>
+                                                        <constraint firstAttribute="height" constant="44" id="g6p-uA-6qO"/>
+                                                        <constraint firstAttribute="trailing" secondItem="lzt-pC-IWF" secondAttribute="trailing" id="rkE-mI-2cE"/>
+                                                        <constraint firstItem="lzt-pC-IWF" firstAttribute="top" secondItem="Jjc-jK-Vci" secondAttribute="top" constant="2" id="yY9-um-40k"/>
                                                     </constraints>
                                                 </view>
                                             </subviews>
@@ -351,16 +383,16 @@
                                                 <bool key="isElement" value="YES"/>
                                             </accessibility>
                                             <constraints>
-                                                <constraint firstItem="LaA-uX-OgX" firstAttribute="top" secondItem="Jjc-jK-Vci" secondAttribute="bottom" constant="4" id="9Nu-VX-htt"/>
+                                                <constraint firstItem="LaA-uX-OgX" firstAttribute="top" secondItem="Jjc-jK-Vci" secondAttribute="bottom" constant="3" id="9Nu-VX-htt"/>
                                                 <constraint firstAttribute="bottom" secondItem="LaA-uX-OgX" secondAttribute="bottom" id="C7U-r6-wZ8"/>
                                                 <constraint firstAttribute="trailing" secondItem="LaA-uX-OgX" secondAttribute="trailing" id="I8w-uy-w4L"/>
                                                 <constraint firstItem="Jjc-jK-Vci" firstAttribute="centerX" secondItem="ecE-wE-iZx" secondAttribute="centerX" id="L1q-wp-a8Q"/>
                                                 <constraint firstItem="LaA-uX-OgX" firstAttribute="leading" secondItem="ecE-wE-iZx" secondAttribute="leading" id="Onq-kn-0ej"/>
-                                                <constraint firstItem="Jjc-jK-Vci" firstAttribute="top" secondItem="ecE-wE-iZx" secondAttribute="top" constant="8" id="q5y-ys-POX"/>
+                                                <constraint firstItem="Jjc-jK-Vci" firstAttribute="top" secondItem="ecE-wE-iZx" secondAttribute="top" constant="9" id="q5y-ys-POX"/>
                                             </constraints>
                                             <connections>
                                                 <outlet property="caption" destination="LaA-uX-OgX" id="eRw-RI-35H"/>
-                                                <outlet property="imageView" destination="b1s-XV-TWG" id="otr-Lg-kn2"/>
+                                                <outlet property="levelMaskView" destination="lzt-pC-IWF" id="XdP-pj-Dbo"/>
                                             </connections>
                                         </view>
                                     </subviews>
@@ -685,10 +717,12 @@
         </scene>
     </scenes>
     <resources>
-        <image name="battery_unknown" width="27" height="44"/>
-        <image name="bolus" width="22" height="23"/>
+        <image name="battery" width="26" height="44"/>
+        <image name="battery_mask" width="16" height="42"/>
+        <image name="bolus" width="22" height="24"/>
         <image name="carbs" width="22" height="23"/>
-        <image name="reservoir_unknown" width="27" height="44"/>
+        <image name="reservoir" width="28" height="44"/>
+        <image name="reservoir_mask" width="28" height="39"/>
         <image name="settings" width="25" height="40"/>
         <image name="workout" width="30" height="29"/>
     </resources>
diff --git a/Loop/Extensions/UIColor.swift b/Loop/Extensions/UIColor.swift
index 2171d09450..37fdce010a 100644
--- a/Loop/Extensions/UIColor.swift
+++ b/Loop/Extensions/UIColor.swift
@@ -16,13 +16,13 @@ extension UIColor {
 
     @nonobjc static let gridColor = UIColor(white: 193 / 255, alpha: 1)
 
-    @nonobjc static let glucoseTintColor = UIColor.HIGTealBlueColor()
+    @nonobjc static let glucoseTintColor = UIColor(red: 0 / 255, green: 176 / 255, blue: 255 / 255, alpha: 1)
 
     @nonobjc static let IOBTintColor = UIColor.HIGOrangeColor()
 
-    @nonobjc static let COBTintColor = UIColor.HIGYellowColor()
+    @nonobjc static let COBTintColor = UIColor(red: 99 / 255, green: 218 / 255, blue: 56 / 255, alpha: 1)
 
-    @nonobjc static let doseTintColor = UIColor.HIGGreenColor()
+    @nonobjc static let doseTintColor = UIColor.HIGOrangeColor()
 
     @nonobjc static let freshColor = UIColor.HIGGreenColor()
 
@@ -42,7 +42,7 @@ extension UIColor {
     }
 
     private static func HIGYellowColor() -> UIColor {
-        return UIColor(red: 1, green: 204 / 255, blue: 0 / 255, alpha: 1)
+        return UIColor(red: 1, green: 204 / 255, blue: 0, alpha: 1)
     }
 
     private static func HIGOrangeColor() -> UIColor {
diff --git a/Loop/Info.plist b/Loop/Info.plist
index a926027204..1588c34047 100644
--- a/Loop/Info.plist
+++ b/Loop/Info.plist
@@ -19,7 +19,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.11.1</string>
+	<string>0.12.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/Loop/View Controllers/StatusTableViewController.swift b/Loop/View Controllers/StatusTableViewController.swift
index 492b313bc8..fe941ab70b 100644
--- a/Loop/View Controllers/StatusTableViewController.swift	
+++ b/Loop/View Controllers/StatusTableViewController.swift	
@@ -58,8 +58,11 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
 
         // Toolbar
         toolbarItems![0].accessibilityLabel = NSLocalizedString("Add Meal", comment: "The label of the carb entry button")
+        toolbarItems![0].tintColor = UIColor.COBTintColor
         toolbarItems![2].accessibilityLabel = NSLocalizedString("Bolus", comment: "The label of the bolus entry button")
+        toolbarItems![2].tintColor = UIColor.doseTintColor
         toolbarItems![6].accessibilityLabel = NSLocalizedString("Settings", comment: "The label of the settings button")
+        toolbarItems![6].tintColor = UIColor.secondaryLabelColor
     }
 
     deinit {
@@ -222,15 +225,17 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
                 }
             }
 
-            reservoirVolume = dataManager.doseStore.lastReservoirValue?.unitVolume
+            if let reservoir = dataManager.doseStore.lastReservoirValue {
+                if let capacity = dataManager.pumpState?.pumpModel?.reservoirCapacity {
+                    reservoirVolumeHUD.reservoirLevel = min(1, max(0, Double(reservoir.unitVolume / Double(capacity))))
+                }
 
-            if let capacity = dataManager.pumpState?.pumpModel?.reservoirCapacity,
-                resVol = reservoirVolume {
-                reservoirLevel = min(1, max(0, Double(resVol / Double(capacity))))
+                reservoirVolumeHUD.reservoirVolume = reservoir.unitVolume
+                reservoirVolumeHUD.lastUpdated = reservoir.startDate
             }
 
             if let status = dataManager.latestPumpStatusFromMySentry {
-                batteryLevel = Double(status.batteryRemainingPercent) / 100
+                batteryLevelHUD.batteryLevel = Double(status.batteryRemainingPercent) / 100
             }
 
             loopCompletionHUD.dosingEnabled = dataManager.loopManager.dosingEnabled
@@ -333,24 +338,6 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
         }
     }
 
-    private var reservoirLevel: Double? {
-        didSet {
-            reservoirVolumeHUD.reservoirLevel = reservoirLevel
-        }
-    }
-
-    private var reservoirVolume: Double? {
-        didSet {
-            reservoirVolumeHUD.reservoirVolume = reservoirVolume
-        }
-    }
-
-    private var batteryLevel: Double? {
-        didSet {
-            batteryLevelHUD.batteryLevel = batteryLevel
-        }
-    }
-
     private var settingTempBasal: Bool = false {
         didSet {
             if let cell = tableView.cellForRowAtIndexPath(NSIndexPath(forRow: StatusRow.RecommendedBasal.rawValue, inSection: Section.Status.rawValue)) {
@@ -382,10 +369,9 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
     // MARK: - Pump/Sensor Section Data
 
     private enum PumpRow: Int {
-        case Date = 0
-        case InsulinOnBoard
+        case InsulinOnBoard = 0
 
-        static let count = 2
+        static let count = 1
     }
 
     private enum SensorRow: Int {
@@ -512,14 +498,6 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
             cell.selectionStyle = .None
 
             switch PumpRow(rawValue: indexPath.row)! {
-            case .Date:
-                cell.textLabel?.text = NSLocalizedString("Last MySentry", comment: "The title of the cell containing the last updated mysentry status packet date")
-
-                if let date = dataManager.latestPumpStatusFromMySentry?.pumpDateComponents.date {
-                    cell.detailTextLabel?.text = dateFormatter.stringFromDate(date)
-                } else {
-                    cell.detailTextLabel?.text = emptyValueString
-                }
             case .InsulinOnBoard:
                 cell.textLabel?.text = NSLocalizedString("Bolus Insulin on Board", comment: "The title of the cell containing the estimated amount of active bolus insulin in the body")
 
@@ -723,6 +701,7 @@ final class StatusTableViewController: UITableViewController, UIGestureRecognize
         let item = UIBarButtonItem(image: UIImage.workoutImage(selected: selected), style: .Plain, target: self, action: #selector(toggleWorkoutMode(_:)))
         item.accessibilityLabel = NSLocalizedString("Workout Mode", comment: "The label of the workout mode toggle button")
         item.accessibilityHint = selected ? NSLocalizedString("Disables", comment: "The action hint of the workout mode toggle button when enabled") : NSLocalizedString("Enables", comment: "The action hint of the workout mode toggle button when disabled")
+        item.tintColor = UIColor.glucoseTintColor
 
         return item
     }
diff --git a/Loop/Views/BatteryLevelHUDView.swift b/Loop/Views/BatteryLevelHUDView.swift
index 38879fc816..a78efd4db9 100644
--- a/Loop/Views/BatteryLevelHUDView.swift
+++ b/Loop/Views/BatteryLevelHUDView.swift
@@ -11,7 +11,13 @@ import UIKit
 
 final class BatteryLevelHUDView: HUDView {
 
-    @IBOutlet private var imageView: UIImageView!
+    @IBOutlet private var levelMaskView: LevelMaskView!
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+
+        tintColor = .unknownColor
+    }
 
     private lazy var numberFormatter: NSNumberFormatter = {
         let formatter = NSNumberFormatter()
@@ -29,7 +35,18 @@ final class BatteryLevelHUDView: HUDView {
                 caption.text = nil
             }
 
-            imageView.image = UIImage.batteryHUDImageWithLevel(batteryLevel)
+            switch batteryLevel {
+            case .None:
+                tintColor = .unknownColor
+            case let x? where x > 0.25:
+                tintColor = .secondaryLabelColor
+            case let x? where x > 0.10:
+                tintColor = .agingColor
+            default:
+                tintColor = .staleColor
+            }
+
+            levelMaskView.value = batteryLevel ?? 1.0
         }
     }
 
diff --git a/Loop/Views/LevelMaskView.swift b/Loop/Views/LevelMaskView.swift
new file mode 100644
index 0000000000..2b35bc7934
--- /dev/null
+++ b/Loop/Views/LevelMaskView.swift
@@ -0,0 +1,83 @@
+//
+//  LevelMaskView.swift
+//  Loop
+//
+//  Created by Nate Racklyeft on 8/28/16.
+//  Copyright © 2016 Nathan Racklyeft. All rights reserved.
+//
+
+import UIKit
+
+// Displays a variable-height level indicator, masked by an image.
+// Inspired by https://github.com/carekit-apple/CareKit/blob/master/CareKit/CareCard/OCKHeartView.h
+
+class LevelMaskView: UIView {
+
+    var value: Double = 1.0 {
+        didSet {
+            animateFill()
+        }
+    }
+
+    @IBInspectable var maskImage: UIImage? {
+        didSet {
+            fillView?.removeFromSuperview()
+            maskView?.removeFromSuperview()
+            maskImageView?.removeFromSuperview()
+
+            guard let maskImage = maskImage else { return }
+
+            maskView = UIView()
+            maskImageView = UIImageView(image: maskImage)
+            maskImageView!.contentMode = .Center
+            maskView!.addSubview(maskImageView!)
+
+            clipsToBounds = true
+
+            fillView = UIView()
+            fillView!.backgroundColor = tintColor
+            addSubview(fillView!)
+        }
+    }
+
+    private var fillView: UIView?
+
+    private var maskImageView: UIView?
+
+    override func layoutSubviews() {
+        super.layoutSubviews()
+
+        guard let maskImage = maskImage else { return }
+
+        let maskImageSize = maskImage.size
+
+        maskView?.frame = CGRect(origin: .zero, size: maskImageSize)
+        maskView?.center = CGPoint(x: bounds.midX, y: bounds.midY)
+        maskImageView?.frame = maskView?.bounds ?? bounds
+
+        if (fillView?.layer.animationKeys()?.count ?? 0) == 0 {
+            updateFillViewFrame()
+        }
+    }
+
+    override func tintColorDidChange() {
+        super.tintColorDidChange()
+
+        fillView?.backgroundColor = tintColor
+    }
+
+    private func animateFill() {
+        UIView.animateWithDuration(1.25, delay: 0, options: .BeginFromCurrentState, animations: {
+            self.updateFillViewFrame()
+        }, completion: nil)
+    }
+
+    private func updateFillViewFrame() {
+        guard let maskViewFrame = maskView?.frame else { return }
+
+        var fillViewFrame = maskViewFrame
+        fillViewFrame.origin.y = maskViewFrame.maxY
+        fillViewFrame.size.height = -CGFloat(value) * maskViewFrame.height
+        fillView?.frame = fillViewFrame
+    }
+}
diff --git a/Loop/Views/ReservoirVolumeHUDView.swift b/Loop/Views/ReservoirVolumeHUDView.swift
index af23563112..67b549de0b 100644
--- a/Loop/Views/ReservoirVolumeHUDView.swift
+++ b/Loop/Views/ReservoirVolumeHUDView.swift
@@ -10,12 +10,60 @@ import UIKit
 
 final class ReservoirVolumeHUDView: HUDView {
 
-    @IBOutlet private var imageView: UIImageView!
+    @IBOutlet private var levelMaskView: LevelMaskView!
+
+    @IBOutlet private var volumeLabel: UILabel!
+
+    override func awakeFromNib() {
+        super.awakeFromNib()
+
+        tintColor = .unknownColor
+        volumeLabel.hidden = true
+    }
+
+    var reservoirLevel: Double? {
+        didSet {
+            levelMaskView.value = reservoirLevel ?? 1.0
+
+            switch reservoirLevel {
+            case .None:
+                tintColor = .unknownColor
+                volumeLabel.hidden = true
+            case let x? where x > 0.25:
+                tintColor = .secondaryLabelColor
+                volumeLabel.hidden = true
+            case let x? where x > 0.10:
+                tintColor = .agingColor
+                volumeLabel.textColor = tintColor
+                volumeLabel.hidden = false
+            default:
+                tintColor = .staleColor
+                volumeLabel.textColor = tintColor
+                volumeLabel.hidden = false
+            }
+        }
+    }
+
+    var lastUpdated: NSDate? {
+        didSet {
+            if let date = lastUpdated {
+                caption?.text = timeFormatter.stringFromDate(date)
+            }
+        }
+    }
+
+    private lazy var timeFormatter: NSDateFormatter = {
+        let formatter = NSDateFormatter()
+        formatter.dateStyle = .NoStyle
+        formatter.timeStyle = .ShortStyle
+
+        return formatter
+    }()
 
     private lazy var numberFormatter: NSNumberFormatter = {
         let formatter = NSNumberFormatter()
         formatter.numberStyle = .DecimalStyle
-        formatter.minimumFractionDigits = 1
+        formatter.maximumFractionDigits = 0
 
         return formatter
     }()
@@ -23,15 +71,9 @@ final class ReservoirVolumeHUDView: HUDView {
     var reservoirVolume: Double? {
         didSet {
             if let volume = reservoirVolume, units = numberFormatter.stringFromNumber(volume) {
-                caption.text = "\(units) U"
+                volumeLabel.text = String(format: NSLocalizedString("%@U", comment: "Format string for reservoir volume. (1: The localized volume)"), units)
             }
         }
     }
 
-    var reservoirLevel: Double? {
-        didSet {
-            imageView.image = UIImage.reservoirHUDImageWithLevel(reservoirLevel)
-        }
-    }
-
 }
diff --git a/LoopTests/Info.plist b/LoopTests/Info.plist
index 12dfb7a8d3..31b423aaa3 100644
--- a/LoopTests/Info.plist
+++ b/LoopTests/Info.plist
@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>BNDL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.11.1</string>
+	<string>0.12.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/WatchApp Extension/Info.plist b/WatchApp Extension/Info.plist
index c11df83a73..3c9421e03f 100644
--- a/WatchApp Extension/Info.plist	
+++ b/WatchApp Extension/Info.plist	
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>XPC!</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.11.1</string>
+	<string>0.12.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
diff --git a/WatchApp/Info.plist b/WatchApp/Info.plist
index f26c995d82..8872c77a19 100644
--- a/WatchApp/Info.plist
+++ b/WatchApp/Info.plist
@@ -17,7 +17,7 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.11.1</string>
+	<string>0.12.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>