Index: sources/gui/qml/pages/settings/SettingsStack.qml
===================================================================
diff -u -r068426e216f9ae5bc4879e4f75bf0f346e33a1ae -re4a0e2fc4c7ae0cbce0d670772276bf7f5ff3845
--- sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision 068426e216f9ae5bc4879e4f75bf0f346e33a1ae)
+++ sources/gui/qml/pages/settings/SettingsStack.qml	(.../SettingsStack.qml)	(revision e4a0e2fc4c7ae0cbce0d670772276bf7f5ff3845)
@@ -164,84 +164,7 @@
         itemIndex : SettingsStack.WiFi
     }
 
-    SettingsBase                { id: _settingsBluetooth
-        itemIndex : SettingsStack.Bluetooth
-        confirmVisible  : false
-        Image { id: _image
-            width   : 640
-            height  : 480
-            source: "qrc:/images/iCuff-Omron-BP7000"
-            anchors {
-                top             : parent.top
-                topMargin       : _settingsBluetooth.topMarginContent
-                right           : parent.right
-                rightMargin     : 0 // the image itself has some margins //  kept to make sure it was intentional.
-            }
-        }
-        Column          { id    : _deviceColumn
-            property int labelHeight: 25
-
-            anchors.top         : _image.top
-            anchors.topMargin   : 100
-            anchors.left        : parent.left
-            anchors.leftMargin  : 50
-            spacing             : 10
-            Label       { id    : _deviceTitle
-                text            : vBluetooth.devicePair ? qsTr("Found Paired Device") : qsTr("Found Device")
-            }
-            Row         { id    : _deviceNameRow
-                leftPadding             : 25
-                Label       { id        : _deviceNameLabel
-                    height              : _deviceColumn.labelHeight
-                    text                : qsTr("Name")
-                    labelWidth          : 125
-                    verticalAlignment   : Text.AlignVCenter
-                }
-                Label       { id        : _deviceName
-                    height              : _deviceColumn.labelHeight
-                    text                : ": " + vBluetooth.deviceName
-                    font.pixelSize      : Fonts.fontPixelNotification
-                    verticalAlignment   : Text.AlignVCenter
-                }
-            }
-            Row {
-                leftPadding             : 25
-                Label       { id        : _deviceAddressLabel
-                    height              : _deviceColumn.labelHeight
-                    text                : qsTr("Address")
-                    labelWidth          : 125
-                    verticalAlignment   : Text.AlignVCenter
-
-                }
-                Label       { id        : _deviceAddress
-                    height              : _deviceColumn.labelHeight
-                    text                : ": " + vBluetooth.deviceAddr
-                    font.pixelSize      : Fonts.fontPixelNotification
-                    verticalAlignment   : Text.AlignVCenter
-                }
-            }
-        }
-        TouchRect { id          : _scanButton
-            anchors.bottom      : parent.bottom
-            anchors.bottomMargin: Variables.mainMenuHeight * 2 + Variables.minVGap
-            anchors.left        : parent.left
-            anchors.leftMargin  : 100
-            text.text           : qsTr("SCAN")
-            width               : 300
-            isDefault           : false
-            enabled             : vBluetooth.scanEnabled
-            onClicked           : vBluetooth.doScan()
-        }
-
-        WaitDone { id           : _scanIndication
-            anchors.horizontalCenter    : parent.horizontalCenter
-            anchors.verticalCenter      : _scanButton.verticalCenter
-            diameter            : _scanButton.height
-            visible             : ! vBluetooth.scanEnabled
-            // done    : _delegate.stepDone
-        }
-
-        notificationText        : vBluetooth.notification
+    SettingsBluetoothCuff       { id: _settingsBluetooth
     }
 
     SettingsDG                  { id: _settingsDGSettings