diff --git a/src/controls/PopupTips.qml b/src/controls/PopupTips.qml
index 3ca5067..dadcb84 100644
--- a/src/controls/PopupTips.qml
+++ b/src/controls/PopupTips.qml
@@ -14,8 +14,8 @@ Window {
     property alias backgroundColor: _background.color
 
     flags: Qt.WindowStaysOnTopHint | Qt.WindowDoesNotAcceptFocus | Qt.ToolTip
-    width: label.implicitWidth + FishUI.Units.largeSpacing * 2
-    height: label.implicitHeight + FishUI.Units.largeSpacing * 2
+    width: label.implicitWidth + FishUI.Units.largeSpacing
+    height: FishUI.Units.fontMetrics.height + FishUI.Units.largeSpacing
 
     FishUI.WindowShadow {
         view: control
diff --git a/src/fish-style/CheckIndicator.qml b/src/fish-style/CheckIndicator.qml
index a3f7f18..ef66822 100644
--- a/src/fish-style/CheckIndicator.qml
+++ b/src/fish-style/CheckIndicator.qml
@@ -34,9 +34,9 @@
 **
 ****************************************************************************/
 
-import QtQuick 2.4
-import QtQuick.Controls.Material 2.4
-import QtQuick.Controls.Material.impl 2.4
+import QtQuick 2.9
+import QtQuick.Controls 2.12
+import QtQuick.Controls.impl 2.12
 
 import FishUI 1.0 as FishUI