diff --git a/qml/StandardItem.qml b/qml/StandardItem.qml
index aa4c91c..2167f54 100644
--- a/qml/StandardItem.qml
+++ b/qml/StandardItem.qml
@@ -35,7 +35,7 @@ Item {
             if (containsMouse && control.popupText !== "") {
                 popupTips.popupText = control.popupText
                 popupTips.position = Qt.point(control.mapToGlobal(0, 0).x + (control.width / 2 - popupTips.width / 2),
-                                              control.height + 1)
+                                              control.height + FishUI.Units.smallSpacing)
                 popupTips.show()
             } else {
                 popupTips.hide()
diff --git a/qml/main.qml b/qml/main.qml
index 6e94b1d..3f5cfaf 100644
--- a/qml/main.qml
+++ b/qml/main.qml
@@ -92,7 +92,7 @@ Item {
             spacing: 0
 
             property var itemSize: rootItem.height * 0.8
-            property var itemWidth: itemSize + FishUI.Units.largeSpacing
+            property var itemWidth: itemSize + FishUI.Units.smallSpacing
 
             Layout.fillHeight: true
             Layout.preferredWidth: itemWidth * count
@@ -180,6 +180,8 @@ Item {
 
                 // Battery Item
                 RowLayout {
+                    visible: battery.available
+
                     Label {
                         font.pointSize: 11
                         text: battery.chargePercent + "%"
@@ -188,13 +190,11 @@ Item {
 
                     Image {
                         id: batteryIcon
-                        visible: battery.available && status === Image.Ready
                         height: rootItem.iconSize
                         width: height + 6
                         sourceSize: Qt.size(width, height)
                         source: "qrc:/images/" + (FishUI.Theme.darkMode ? "dark/" : "light/") + battery.iconSource
                         Layout.alignment: Qt.AlignCenter
-                        asynchronous: true
                     }
                 }