diff --git a/plasmoid/package/contents/ui/DevicesPage.qml b/plasmoid/package/contents/ui/DevicesPage.qml
index fb6da3b..178102e 100644
--- a/plasmoid/package/contents/ui/DevicesPage.qml
+++ b/plasmoid/package/contents/ui/DevicesPage.qml
@@ -4,13 +4,12 @@ import QtQml.Models 2.2
 import org.kde.plasma.components 2.0 as PlasmaComponents  // for Menu and MenuItem
 import org.kde.plasma.components 3.0 as PlasmaComponents3
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.extras 2.0 as PlasmaExtras
 
 Item {
     property alias view: deviceView
     objectName: "DevicesPage"
 
-    PlasmaExtras.ScrollArea {
+    PlasmaComponents3.ScrollView {
         anchors.fill: parent
 
         TopLevelView {
diff --git a/plasmoid/package/contents/ui/DirectoriesPage.qml b/plasmoid/package/contents/ui/DirectoriesPage.qml
index e3dd6d6..3a7e0b8 100644
--- a/plasmoid/package/contents/ui/DirectoriesPage.qml
+++ b/plasmoid/package/contents/ui/DirectoriesPage.qml
@@ -4,7 +4,6 @@ import QtQml.Models 2.2
 import org.kde.plasma.components 2.0 as PlasmaComponents  // for Menu and MenuItem
 import org.kde.plasma.components 3.0 as PlasmaComponents3
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.extras 2.0 as PlasmaExtras
 import martchus.syncthingplasmoid 0.6 as SyncthingPlasmoid
 
 ColumnLayout {
@@ -22,7 +21,7 @@ ColumnLayout {
         onTextChanged: directoryView.model.filterRegularExpression = new RegExp(text)
     }
 
-    PlasmaExtras.ScrollArea {
+    PlasmaComponents3.ScrollView {
         Layout.fillWidth: true
         Layout.fillHeight: true
 
diff --git a/plasmoid/package/contents/ui/DownloadsPage.qml b/plasmoid/package/contents/ui/DownloadsPage.qml
index 67fe823..ee4774f 100644
--- a/plasmoid/package/contents/ui/DownloadsPage.qml
+++ b/plasmoid/package/contents/ui/DownloadsPage.qml
@@ -4,13 +4,12 @@ import QtQml.Models 2.2
 import org.kde.plasma.components 2.0 as PlasmaComponents  // for Menu and MenuItem
 import org.kde.plasma.components 3.0 as PlasmaComponents3
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.extras 2.0 as PlasmaExtras
 
 Item {
     property alias view: downloadView
     objectName: "DownloadsPage"
 
-    PlasmaExtras.ScrollArea {
+    PlasmaComponents3.ScrollView {
         anchors.fill: parent
 
         TopLevelView {
diff --git a/plasmoid/package/contents/ui/RecentChangesPage.qml b/plasmoid/package/contents/ui/RecentChangesPage.qml
index 17d8443..17258ce 100644
--- a/plasmoid/package/contents/ui/RecentChangesPage.qml
+++ b/plasmoid/package/contents/ui/RecentChangesPage.qml
@@ -4,13 +4,12 @@ import QtQml.Models 2.2
 import org.kde.plasma.components 2.0 as PlasmaComponents  // for Menu and MenuItem
 import org.kde.plasma.components 3.0 as PlasmaComponents3
 import org.kde.plasma.core 2.0 as PlasmaCore
-import org.kde.plasma.extras 2.0 as PlasmaExtras
 
 Item {
     property alias view: recentChangesView
     objectName: "RecentChangesPage"
 
-    PlasmaExtras.ScrollArea {
+    PlasmaComponents3.ScrollView {
         anchors.fill: parent
 
         TopLevelView {
diff --git a/plasmoid/package/contents/ui/TabButton.qml b/plasmoid/package/contents/ui/TabButton.qml
index ebc0ca4..cb8f26d 100644
--- a/plasmoid/package/contents/ui/TabButton.qml
+++ b/plasmoid/package/contents/ui/TabButton.qml
@@ -24,7 +24,6 @@ PlasmaComponents3.TabButton {
             id: label
             visible: text.length > 0
             text: root.text
-            font: root.parent.font
             color: PlasmaCore.ColorScope.textColor
             elide: Text.ElideRight
             Layout.fillHeight: true
diff --git a/plasmoid/package/contents/ui/ToolButton.qml b/plasmoid/package/contents/ui/ToolButton.qml
index c295b1d..527c236 100644
--- a/plasmoid/package/contents/ui/ToolButton.qml
+++ b/plasmoid/package/contents/ui/ToolButton.qml
@@ -20,7 +20,6 @@ PlasmaComponents3.ToolButton {
             id: label
             visible: text.length > 0
             text: root.text
-            font: root.parent.font
             color: PlasmaCore.ColorScope.textColor
             elide: Text.ElideRight
             Layout.fillWidth: true
diff --git a/plasmoid/package/contents/ui/main.qml b/plasmoid/package/contents/ui/main.qml
index f60e966..d0da6a2 100644
--- a/plasmoid/package/contents/ui/main.qml
+++ b/plasmoid/package/contents/ui/main.qml
@@ -17,12 +17,7 @@ Item {
     Plasmoid.icon: "syncthingtray"
     Plasmoid.toolTipMainText: plasmoid.nativeInterface.statusText
     Plasmoid.toolTipSubText: plasmoid.nativeInterface.additionalStatusText
-    Plasmoid.toolTipItem: ToolTipView {
-        Layout.minimumWidth: item ? item.width : 0
-        Layout.maximumWidth: item ? item.width : 0
-        Layout.minimumHeight: item ? item.height : 0
-        Layout.maximumHeight: item ? item.height : 0
-    }
+    Plasmoid.toolTipItem: ToolTipView {}
 
     Plasmoid.hideOnWindowDeactivate: true