diff --git a/client/resources.qrc b/client/resources.qrc
index 5edd1e8a..38f0e79a 100644
--- a/client/resources.qrc
+++ b/client/resources.qrc
@@ -151,6 +151,7 @@
         <file>ui/qml/Controls2/PageType.qml</file>
         <file>ui/qml/Controls2/PopupType.qml</file>
         <file>ui/qml/Controls2/ProgressBarType.qml</file>
+        <file>ui/qml/Controls2/ScrollBarType.qml</file>
         <file>ui/qml/Controls2/StackViewType.qml</file>
         <file>ui/qml/Controls2/SwitcherType.qml</file>
         <file>ui/qml/Controls2/TabButtonType.qml</file>
diff --git a/client/ui/qml/Components/HomeContainersListView.qml b/client/ui/qml/Components/HomeContainersListView.qml
index 8ddccb5a..3dc31300 100644
--- a/client/ui/qml/Components/HomeContainersListView.qml
+++ b/client/ui/qml/Components/HomeContainersListView.qml
@@ -30,7 +30,7 @@ ListView {
 
     // snapMode: ListView.SnapToItem
 
-    // ScrollBar.vertical: ScrollBar {}
+    ScrollBar.vertical: ScrollBarType {}
 
     property bool isFocusable: true
 
diff --git a/client/ui/qml/Components/InstalledAppsDrawer.qml b/client/ui/qml/Components/InstalledAppsDrawer.qml
index ca579491..5835e1c6 100644
--- a/client/ui/qml/Components/InstalledAppsDrawer.qml
+++ b/client/ui/qml/Components/InstalledAppsDrawer.qml
@@ -81,10 +81,7 @@ DrawerType2 {
                     }
                 }
 
-                ScrollBar.vertical: ScrollBar {
-                    id: scrollBar
-                    policy: ScrollBar.AlwaysOn
-                }
+                ScrollBar.vertical: ScrollBarType {}
 
                 ButtonGroup {
                     id: buttonGroup
diff --git a/client/ui/qml/Components/ServersListView.qml b/client/ui/qml/Components/ServersListView.qml
index 9270c0e6..1711a458 100644
--- a/client/ui/qml/Components/ServersListView.qml
+++ b/client/ui/qml/Components/ServersListView.qml
@@ -27,7 +27,7 @@ ListView {
     model: ServersModel
     currentIndex: ServersModel.defaultIndex
 
-    ScrollBar.vertical: ScrollBar {
+    ScrollBar.vertical: ScrollBarType {
         id: scrollBar
         objectName: "scrollBar"
         policy: root.height >= root.contentHeight ? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
diff --git a/client/ui/qml/Components/ShareConnectionDrawer.qml b/client/ui/qml/Components/ShareConnectionDrawer.qml
index 7e8db993..d3bbaa17 100644
--- a/client/ui/qml/Components/ShareConnectionDrawer.qml
+++ b/client/ui/qml/Components/ShareConnectionDrawer.qml
@@ -85,9 +85,7 @@ DrawerType2 {
                 FocusController.nextKeyRightItem()
             }
 
-            ScrollBar.vertical: ScrollBar {
-                policy: ScrollBar.AsNeeded
-            }
+            ScrollBar.vertical: ScrollBarType {}
 
             model: 1
 
diff --git a/client/ui/qml/Controls2/FlickableType.qml b/client/ui/qml/Controls2/FlickableType.qml
index 2151e520..b3e5cabf 100644
--- a/client/ui/qml/Controls2/FlickableType.qml
+++ b/client/ui/qml/Controls2/FlickableType.qml
@@ -25,7 +25,7 @@ Flickable {
     Keys.onUpPressed: scrollBar.decrease()
     Keys.onDownPressed: scrollBar.increase()
 
-    ScrollBar.vertical: ScrollBar {
+    ScrollBar.vertical: ScrollBarType {
         id: scrollBar
         policy: fl.height >= fl.contentHeight ? ScrollBar.AlwaysOff : ScrollBar.AlwaysOn
     }
diff --git a/client/ui/qml/Controls2/ScrollBarType.qml b/client/ui/qml/Controls2/ScrollBarType.qml
new file mode 100644
index 00000000..d91431ab
--- /dev/null
+++ b/client/ui/qml/Controls2/ScrollBarType.qml
@@ -0,0 +1,11 @@
+import QtQuick
+import QtQuick.Controls
+
+import "./"
+import "../Controls2"
+
+ScrollBar {
+    id: root
+    
+    policy: ScrollBar.AsNeeded
+}
diff --git a/client/ui/qml/Pages2/PageSettingsAbout.qml b/client/ui/qml/Pages2/PageSettingsAbout.qml
index 8501d2a4..6145da8d 100644
--- a/client/ui/qml/Pages2/PageSettingsAbout.qml
+++ b/client/ui/qml/Pages2/PageSettingsAbout.qml
@@ -115,9 +115,7 @@ PageType {
             FocusController.nextKeyRightItem()
         }
 
-        ScrollBar.vertical: ScrollBar {
-            policy: ScrollBar.AsNeeded
-        }
+        ScrollBar.vertical: ScrollBarType {}
 
         model: contacts
 
diff --git a/client/ui/qml/Pages2/PageSettingsLogging.qml b/client/ui/qml/Pages2/PageSettingsLogging.qml
index 4b2d7d42..9d85173e 100644
--- a/client/ui/qml/Pages2/PageSettingsLogging.qml
+++ b/client/ui/qml/Pages2/PageSettingsLogging.qml
@@ -122,9 +122,7 @@ PageType {
             FocusController.nextKeyRightItem()
         }
 
-        ScrollBar.vertical: ScrollBar {
-            policy: ScrollBar.AsNeeded
-        }
+        ScrollBar.vertical: ScrollBarType {}
 
         model: logTypes
         spacing: 24