diff --git a/mobile-widgets/qml/DiveDetails.qml b/mobile-widgets/qml/DiveDetails.qml
index 042e59e38..2b796bb14 100644
--- a/mobile-widgets/qml/DiveDetails.qml
+++ b/mobile-widgets/qml/DiveDetails.qml
@@ -176,6 +176,7 @@ Kirigami.Page {
 	actions.main: Kirigami.Action {
 		icon {
 			name: state !== "view" ? "document-save" : "document-edit"
+			color: subsurfaceTheme.primaryColor
 		}
 		onTriggered: {
 			manager.appendTextToLog("save/edit button triggered")
diff --git a/mobile-widgets/qml/DiveList.qml b/mobile-widgets/qml/DiveList.qml
index d5719b862..cf4f99e5a 100644
--- a/mobile-widgets/qml/DiveList.qml
+++ b/mobile-widgets/qml/DiveList.qml
@@ -333,6 +333,7 @@ Kirigami.ScrollablePage {
 	property QtObject downloadFromDCAction: Kirigami.Action {
 		icon {
 			name: "downloadDC"
+			color: subsurfaceTheme.primaryColor
 		}
 		onTriggered: {
 			downloadFromDc.dcImportModel.clearTable()
diff --git a/mobile-widgets/qml/main.qml b/mobile-widgets/qml/main.qml
index 08b5f329f..b5bac7869 100644
--- a/mobile-widgets/qml/main.qml
+++ b/mobile-widgets/qml/main.qml
@@ -7,7 +7,7 @@ import QtQuick.Dialogs 1.2
 import QtQuick.Layouts 1.2
 import QtQuick.Window 2.2
 import org.subsurfacedivelog.mobile 1.0
-import org.kde.kirigami 2.0 as Kirigami
+import org.kde.kirigami 2.2 as Kirigami
 
 Kirigami.ApplicationWindow {
 	id: rootItem
@@ -443,17 +443,6 @@ if you have network connectivity and want to sync your data to cloud storage."),
 
 		property int columnWidth: Math.round(rootItem.width/(Kirigami.Units.gridUnit*28)) > 0 ? Math.round(rootItem.width / Math.round(rootItem.width/(Kirigami.Units.gridUnit*28))) : rootItem.width
 		Component.onCompleted: {
-			Kirigami.Theme.highlightColor = Qt.binding(function() { return primaryColor })
-			Kirigami.Theme.highlightedTextColor = Qt.binding(function() { return darkerPrimaryTextColor })
-			Kirigami.Theme.backgroundColor = Qt.binding(function() { return backgroundColor })
-			Kirigami.Theme.textColor = Qt.binding(function() { return textColor })
-			Kirigami.Theme.buttonHoverColor = Qt.binding(function() { return primaryColor })
-			Kirigami.Theme.viewBackgroundColor = Qt.binding(function() { return drawerColor })
-			Kirigami.Theme.viewTextColor = Qt.binding(function() { return textColor })
-			Kirigami.Theme.buttonBackgroundColor = Qt.binding(function() { return drawerColor })
-			Kirigami.Theme.buttonTextColor = Qt.binding(function() { return textColor })
-			Kirigami.Theme.buttonFocusColor = Qt.binding(function() { return "red" })
-
 			// this needs to pick the theme from persistent preference settings
 			var theme = manager.theme
 			if (theme == "Blue")