diff --git a/resources/qml/PrinterSelector/MachineSelector.qml b/resources/qml/PrinterSelector/MachineSelector.qml
index 15cd773c90..780b5baa74 100644
--- a/resources/qml/PrinterSelector/MachineSelector.qml
+++ b/resources/qml/PrinterSelector/MachineSelector.qml
@@ -12,6 +12,7 @@ Cura.ExpandableComponent
     id: machineSelector
 
     property bool isNetworkPrinter: Cura.MachineManager.activeMachineNetworkKey != ""
+    property bool isCloudConnected: Cura.MachineManager.activeMachineCloudKey != ""
     property bool isPrinterConnected: Cura.MachineManager.printerConnected
     property var outputDevice: Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null
 
@@ -55,7 +56,7 @@ Cura.ExpandableComponent
                 leftMargin: UM.Theme.getSize("thick_margin").width
             }
 
-            source: UM.Theme.getIcon("printer_connected")
+            source: isCloudConnected ? UM.Theme.getIcon("printer_cloud_connected") : UM.Theme.getIcon("printer_connected")
             width: UM.Theme.getSize("printer_status_icon").width
             height: UM.Theme.getSize("printer_status_icon").height
 
@@ -63,7 +64,7 @@ Cura.ExpandableComponent
             sourceSize.height: height
 
             color: UM.Theme.getColor("primary")
-            visible: isNetworkPrinter && isPrinterConnected
+            visible: isNetworkPrinter && (isPrinterConnected || isCloudConnected)
 
             // Make a themable circle in the background so we can change it in other themes
             Rectangle
diff --git a/resources/qml/PrinterSelector/MachineSelectorList.qml b/resources/qml/PrinterSelector/MachineSelectorList.qml
index 26c703fddd..e605f23f73 100644
--- a/resources/qml/PrinterSelector/MachineSelectorList.qml
+++ b/resources/qml/PrinterSelector/MachineSelectorList.qml
@@ -79,7 +79,7 @@ Column
         delegate: MachineSelectorButton
         {
             text: model.metadata["connect_group_name"]
-            checked: Cura.MachineManager.activeMachineNetworkGroupName == model.metadata["connect_group_name"]
+            checked: true  // cloud devices are always online if they are available
             outputDevice: Cura.MachineManager.printerOutputDevices.length >= 1 ? Cura.MachineManager.printerOutputDevices[0] : null
 
             Connections
diff --git a/resources/themes/cura-light/icons/printer_cloud_connected.svg b/resources/themes/cura-light/icons/printer_cloud_connected.svg
new file mode 100644
index 0000000000..e69de29bb2