diff --git a/CGMBLEKitG5Plugin/Info.plist b/CGMBLEKitG5Plugin/Info.plist
index 844749bb..9db80e4b 100644
--- a/CGMBLEKitG5Plugin/Info.plist
+++ b/CGMBLEKitG5Plugin/Info.plist
@@ -26,5 +26,7 @@
 	<string>Dexcom G5</string>
 	<key>com.loopkit.Loop.CGMManagerIdentifier</key>
 	<string>DexG5Transmitter</string>
+	<key>com.loopkit.Loop.DeviceManufacturer</key>
+	<string>Dexcom</string>
 </dict>
 </plist>
diff --git a/CGMBLEKitG6Plugin/Info.plist b/CGMBLEKitG6Plugin/Info.plist
index 43ff83ac..ebc4d51e 100644
--- a/CGMBLEKitG6Plugin/Info.plist
+++ b/CGMBLEKitG6Plugin/Info.plist
@@ -26,5 +26,7 @@
 	<string>Dexcom G6 / ONE</string>
 	<key>com.loopkit.Loop.CGMManagerIdentifier</key>
 	<string>DexG6Transmitter</string>
+	<key>com.loopkit.Loop.DeviceManufacturer</key>
+	<string>Dexcom</string>
 </dict>
 </plist>
diff --git a/CGMBLEKitUI/Assets.xcassets/g5.imageset/Contents.json b/CGMBLEKitUI/Assets.xcassets/g5.imageset/Contents.json
new file mode 100644
index 00000000..568684ba
--- /dev/null
+++ b/CGMBLEKitUI/Assets.xcassets/g5.imageset/Contents.json
@@ -0,0 +1,12 @@
+{
+  "images" : [
+    {
+      "filename" : "g5.png",
+      "idiom" : "universal"
+    }
+  ],
+  "info" : {
+    "author" : "xcode",
+    "version" : 1
+  }
+}
diff --git a/CGMBLEKitUI/Assets.xcassets/g5.imageset/g5.png b/CGMBLEKitUI/Assets.xcassets/g5.imageset/g5.png
new file mode 100644
index 00000000..d1c699d8
Binary files /dev/null and b/CGMBLEKitUI/Assets.xcassets/g5.imageset/g5.png differ
diff --git a/CGMBLEKitUI/TransmitterManager+UI.swift b/CGMBLEKitUI/TransmitterManager+UI.swift
index 5c595e0e..2e113b1a 100644
--- a/CGMBLEKitUI/TransmitterManager+UI.swift
+++ b/CGMBLEKitUI/TransmitterManager+UI.swift
@@ -16,6 +16,10 @@ extension G5CGMManager: CGMManagerUI {
         return nil
     }
 
+    public static var pickerImage: UIImage? {
+        return UIImage(named: "g5", in: Bundle(for: TransmitterSetupViewController.self), compatibleWith: nil)
+    }
+
     public static func setupViewController(bluetoothProvider: BluetoothProvider, displayGlucosePreference: DisplayGlucosePreference, colorPalette: LoopUIColorPalette, allowDebugFeatures: Bool, prefersToSkipUserInteraction: Bool = false) -> SetupUIResult<CGMManagerViewController, CGMManagerUI> {
         let setupVC = TransmitterSetupViewController.instantiateFromStoryboard()
         setupVC.cgmManagerType = self
@@ -54,6 +58,10 @@ extension G6CGMManager: CGMManagerUI {
         return nil
     }
 
+    public static var pickerImage: UIImage? {
+        return UIImage(named: "g6", in: Bundle(for: TransmitterSetupViewController.self), compatibleWith: nil)
+    }
+
     public static func setupViewController(bluetoothProvider: BluetoothProvider, displayGlucosePreference: DisplayGlucosePreference, colorPalette: LoopUIColorPalette, allowDebugFeatures: Bool, prefersToSkipUserInteraction: Bool = false) -> SetupUIResult<CGMManagerViewController, CGMManagerUI> {
         let setupVC = TransmitterSetupViewController.instantiateFromStoryboard()
         setupVC.cgmManagerType = self