diff --git a/modules/Backlight.qml b/modules/Backlight.qml
index 2529c47..a0ccc90 100644
--- a/modules/Backlight.qml
+++ b/modules/Backlight.qml
@@ -42,12 +42,11 @@ M.BarSection {
             root.percent = Math.round((c / m) * 100);
     }
 
-    M.BarIcon {
-        icon: "\uF185"
-        anchors.verticalCenter: parent.verticalCenter
-    }
-    M.BarLabel {
-        label: root.percent + "%"
+    Text {
+        text: root.percent + "% "
+        color: M.Theme.base05
+        font.pixelSize: M.Theme.fontSize
+        font.family: M.Theme.fontFamily
         anchors.verticalCenter: parent.verticalCenter
     }
 
diff --git a/modules/BarIcon.qml b/modules/BarIcon.qml
index 17c11e3..3d22c14 100644
--- a/modules/BarIcon.qml
+++ b/modules/BarIcon.qml
@@ -13,7 +13,7 @@ Text {
     verticalAlignment: Text.AlignVCenter
 
     HoverHandler { id: _hover }
-    M.BarTooltip {
+    ToolTip {
         visible: _hover.hovered && parent.tooltip !== ""
         text: parent.tooltip
     }
diff --git a/modules/BarLabel.qml b/modules/BarLabel.qml
index 4f5bc89..d92d0f3 100644
--- a/modules/BarLabel.qml
+++ b/modules/BarLabel.qml
@@ -13,7 +13,7 @@ Text {
     verticalAlignment: Text.AlignVCenter
 
     HoverHandler { id: _hover }
-    M.BarTooltip {
+    ToolTip {
         visible: _hover.hovered && parent.tooltip !== ""
         text: parent.tooltip
     }
diff --git a/modules/BarSection.qml b/modules/BarSection.qml
index 16f5cec..7c9b236 100644
--- a/modules/BarSection.qml
+++ b/modules/BarSection.qml
@@ -1,11 +1,11 @@
 import QtQuick
-import "." as M
+import QtQuick.Controls
 
 Row {
     property string tooltip: ""
 
     HoverHandler { id: _hover }
-    M.BarTooltip {
+    ToolTip {
         visible: _hover.hovered && parent.tooltip !== ""
         text: parent.tooltip
     }
diff --git a/modules/BarTooltip.qml b/modules/BarTooltip.qml
deleted file mode 100644
index f6fe501..0000000
--- a/modules/BarTooltip.qml
+++ /dev/null
@@ -1,22 +0,0 @@
-import QtQuick
-import QtQuick.Controls
-import "." as M
-
-ToolTip {
-    id: tip
-    padding: 6
-
-    background: Rectangle {
-        color: M.Theme.base01
-        border.color: M.Theme.base03
-        border.width: 1
-        radius: 4
-    }
-
-    contentItem: Text {
-        text: tip.text
-        color: M.Theme.base05
-        font.pixelSize: M.Theme.fontSize
-        font.family: M.Theme.fontFamily
-    }
-}
diff --git a/modules/qmldir b/modules/qmldir
index 0b272ba..77815c6 100644
--- a/modules/qmldir
+++ b/modules/qmldir
@@ -2,7 +2,6 @@ module modules
 singleton Theme 1.0 Theme.qml
 Bar 1.0 Bar.qml
 BarSection 1.0 BarSection.qml
-BarTooltip 1.0 BarTooltip.qml
 Workspaces 1.0 Workspaces.qml
 WindowTitle 1.0 WindowTitle.qml
 Clock 1.0 Clock.qml