diff --git a/src/imports/mvvmquick/MsgBoxBase.qml b/src/imports/mvvmquick/MsgBoxBase.qml
index 183c93f..cddf7de 100644
--- a/src/imports/mvvmquick/MsgBoxBase.qml
+++ b/src/imports/mvvmquick/MsgBoxBase.qml
@@ -3,6 +3,7 @@ import QtQuick.Controls 2.3
 import QtQuick.Window 2.2
 import QtQuick.Layouts 1.3
 import de.skycoder42.QtMvvm.Core 1.0
+import de.skycoder42.QtMvvm.Quick 1.1
 
 AlertDialog {
 	id: _msgBoxBase
@@ -26,8 +27,8 @@ AlertDialog {
 				id: _icon
 				visible: false
 
-				Layout.preferredWidth: 24
-				Layout.preferredHeight: 24
+				Layout.preferredWidth: implicitWidth
+				Layout.preferredHeight: implicitHeight
 				Layout.alignment: Qt.AlignVCenter
 			}
 
diff --git a/src/imports/mvvmquick/OverviewListView.qml b/src/imports/mvvmquick/OverviewListView.qml
index e3a9cb3..72ad5de 100644
--- a/src/imports/mvvmquick/OverviewListView.qml
+++ b/src/imports/mvvmquick/OverviewListView.qml
@@ -1,7 +1,7 @@
 import QtQuick 2.10
 import QtQuick.Controls 2.3
 import QtQuick.Layouts 1.3
-import de.skycoder42.QtMvvm.Quick 1.0
+import de.skycoder42.QtMvvm.Quick 1.1
 
 ListView {
 	id: _sectionListView
@@ -35,8 +35,8 @@ ListView {
 				Layout.column: 0
 				Layout.rowSpan: 2
 				Layout.fillHeight: true
-				Layout.preferredWidth: iconSize.width
-				Layout.preferredHeight: iconSize.height
+				Layout.preferredWidth: implicitWidth
+				Layout.preferredHeight: implicitHeight
 				Layout.alignment: Qt.AlignVCenter | Qt.AlignLeft
 			}
 
@@ -67,8 +67,8 @@ ListView {
 				Layout.column: 2
 				Layout.rowSpan: 2
 				Layout.fillHeight: true
-				Layout.preferredWidth: iconSize.width
-				Layout.preferredHeight: iconSize.height
+				Layout.preferredWidth: implicitWidth
+				Layout.preferredHeight: implicitHeight
 				Layout.alignment: Qt.AlignVCenter | Qt.AlignRight
 			}
 		}
diff --git a/src/imports/mvvmquick/TintIcon.qml b/src/imports/mvvmquick/TintIcon.qml
index bdcb8d1..bde56e2 100644
--- a/src/imports/mvvmquick/TintIcon.qml
+++ b/src/imports/mvvmquick/TintIcon.qml
@@ -6,30 +6,25 @@ import de.skycoder42.QtMvvm.Quick 1.1
 Item {
 	id: _tintIcon
 
-	property size iconSize: Qt.size(24, 24)
-	property alias tintColor: _overlay.color
-	property alias source: _image.source
+	property alias icon: _imgBtn.icon
+	property alias source: _imgBtn.icon.source
 
-	Image {
-		id: _image
-		anchors.centerIn: parent
-		fillMode: Image.PreserveAspectFit
-		horizontalAlignment: Image.AlignHCenter
-		verticalAlignment: Image.AlignVCenter
-		width: iconSize.width
-		height: iconSize.height
-		sourceSize: iconSize
-		visible: false
-	}
+	implicitWidth: _imgBtn.icon.width
+	implicitHeight: _imgBtn.icon.height
 
-	ColorHelper {
-		id: helper
+	Displace {
+		source: _imgBtn
+		z: 10
+		anchors.fill: parent
 	}
 
-	ColorOverlay {
-		id: _overlay
-		anchors.fill: _image
-		source: _image
-		color: helper.text
+	ActionButton {
+		id: _imgBtn
+		visible: false
+		z: -10
+		padding: 0
+		anchors.fill: parent
+
+		background: Item {}
 	}
 }
diff --git a/src/imports/mvvmquick/qmldir b/src/imports/mvvmquick/qmldir
index 1d6c826..f9c27aa 100644
--- a/src/imports/mvvmquick/qmldir
+++ b/src/imports/mvvmquick/qmldir
@@ -7,7 +7,6 @@ depends QtGraphicalEffects 1.0
 depends Qt.labs.platform 1.0
 depends de.skycoder42.QtMvvm.Core 1.0
 
-internal TintIcon TintIcon.qml
 internal MsgBoxBase MsgBoxBase.qml
 internal MsgBox MsgBox.qml
 internal InputDialog InputDialog.qml
@@ -27,6 +26,7 @@ ToolBarLabel 1.0 ToolBarLabel.qml
 ActionButton 1.0 ActionButton.qml
 RoundActionButton 1.0 RoundActionButton.qml
 MenuButton 1.0 MenuButton.qml
+TintIcon 1.1 TintIcon.qml
 
 SearchBar 1.1 SearchBar.qml
 RoundMenuButton 1.1 RoundMenuButton.qml