diff --git a/plugins/disk-mount/diskcontrolitem.cpp b/plugins/disk-mount/diskcontrolitem.cpp
index 851e7ce1f..64ba95818 100644
--- a/plugins/disk-mount/diskcontrolitem.cpp
+++ b/plugins/disk-mount/diskcontrolitem.cpp
@@ -6,7 +6,7 @@
 DWIDGET_USE_NAMESPACE
 
 DiskControlItem::DiskControlItem(const DiskInfo &info, QWidget *parent)
-    : QWidget(parent),
+    : QFrame(parent),
 
       m_unknowIcon(":/icons/resources/unknown.svg"),
 
@@ -62,9 +62,13 @@ DiskControlItem::DiskControlItem(const DiskInfo &info, QWidget *parent)
     centeralLayout->addWidget(m_diskIcon);
     centeralLayout->addLayout(progressLayout);
     centeralLayout->setSpacing(0);
-    centeralLayout->setMargin(0);
+    centeralLayout->setContentsMargins(0, 0, 5, 0);
 
     setLayout(centeralLayout);
+    setObjectName("DiskItem");
+    setStyleSheet("QFrame #DiskItem:hover {"
+                  "background-color:rgba(255, 255, 255, .1);"
+                  "}");
 
     connect(m_unmountButton, &DImageButton::clicked, [this] {emit requestUnmount(m_info.m_id);});
 
diff --git a/plugins/disk-mount/diskcontrolitem.h b/plugins/disk-mount/diskcontrolitem.h
index ed91e46b8..a24c6e04b 100644
--- a/plugins/disk-mount/diskcontrolitem.h
+++ b/plugins/disk-mount/diskcontrolitem.h
@@ -10,7 +10,7 @@
 #include <QProgressBar>
 #include <QIcon>
 
-class DiskControlItem : public QWidget
+class DiskControlItem : public QFrame
 {
     Q_OBJECT
 
diff --git a/plugins/disk-mount/diskcontrolwidget.cpp b/plugins/disk-mount/diskcontrolwidget.cpp
index 7939eb342..4a54639f6 100644
--- a/plugins/disk-mount/diskcontrolwidget.cpp
+++ b/plugins/disk-mount/diskcontrolwidget.cpp
@@ -1,7 +1,6 @@
 #include "diskcontrolwidget.h"
 #include "diskcontrolitem.h"
 
-#define MAX_HEIGHT      300
 #define WIDTH           300
 
 DiskControlWidget::DiskControlWidget(QWidget *parent)
@@ -56,7 +55,7 @@ void DiskControlWidget::diskListChanged()
     emit diskCountChanged(mountedCount);
 
     const int contentHeight = mountedCount * 70;
-    const int maxHeight = std::min(contentHeight, MAX_HEIGHT);
+    const int maxHeight = std::min(contentHeight, 70 * 6);
 
     m_centeralWidget->setFixedHeight(contentHeight);
     setFixedHeight(maxHeight);
diff --git a/plugins/disk-mount/diskmountplugin.cpp b/plugins/disk-mount/diskmountplugin.cpp
index 8d141e5ae..17ac8f23d 100644
--- a/plugins/disk-mount/diskmountplugin.cpp
+++ b/plugins/disk-mount/diskmountplugin.cpp
@@ -5,10 +5,15 @@ DiskMountPlugin::DiskMountPlugin(QObject *parent)
 
       m_pluginAdded(false),
 
+      m_tipsLabel(new QLabel),
       m_diskPluginItem(new DiskPluginItem),
       m_diskControlApplet(nullptr)
 {
     m_diskPluginItem->setVisible(false);
+    m_tipsLabel->setVisible(false);
+    m_tipsLabel->setText(tr("Disk"));
+    m_tipsLabel->setStyleSheet("color:white;"
+                               "padding:5px 10px;");
 }
 
 const QString DiskMountPlugin::pluginName() const
@@ -31,6 +36,13 @@ QWidget *DiskMountPlugin::itemWidget(const QString &itemKey)
     return m_diskPluginItem;
 }
 
+QWidget *DiskMountPlugin::itemTipsWidget(const QString &itemKey)
+{
+    Q_UNUSED(itemKey);
+
+    return m_tipsLabel;
+}
+
 QWidget *DiskMountPlugin::itemPopupApplet(const QString &itemKey)
 {
     Q_UNUSED(itemKey);
diff --git a/plugins/disk-mount/diskmountplugin.h b/plugins/disk-mount/diskmountplugin.h
index b0e84780b..4522548a0 100644
--- a/plugins/disk-mount/diskmountplugin.h
+++ b/plugins/disk-mount/diskmountplugin.h
@@ -1,6 +1,8 @@
 #ifndef DISKMOUNTPLUGIN_H
 #define DISKMOUNTPLUGIN_H
 
+#include <QLabel>
+
 #include "pluginsiteminterface.h"
 #include "diskcontrolwidget.h"
 #include "diskpluginitem.h"
@@ -18,6 +20,7 @@ public:
     void init(PluginProxyInterface *proxyInter);
 
     QWidget *itemWidget(const QString &itemKey);
+    QWidget *itemTipsWidget(const QString &itemKey);
     QWidget *itemPopupApplet(const QString &itemKey);
 
 private:
@@ -31,6 +34,7 @@ private slots:
 private:
     bool m_pluginAdded;
 
+    QLabel *m_tipsLabel;
     DiskPluginItem *m_diskPluginItem;
     DiskControlWidget *m_diskControlApplet;
 };
diff --git a/plugins/shutdown/shutdownplugin.cpp b/plugins/shutdown/shutdownplugin.cpp
index f5ba8101f..4daa174fd 100644
--- a/plugins/shutdown/shutdownplugin.cpp
+++ b/plugins/shutdown/shutdownplugin.cpp
@@ -40,18 +40,15 @@ QWidget *ShutdownPlugin::itemWidget(const QString &itemKey)
 
 QWidget *ShutdownPlugin::itemTipsWidget(const QString &itemKey)
 {
-    const Dock::DisplayMode mode = displayMode();
-
-    if (mode == Dock::Efficient && itemKey == SHUTDOWN_KEY)
-        return nullptr;
-
     const BatteryPercentageMap data = m_powerInter->batteryPercentage();
 
-    if (data.isEmpty())
-        return nullptr;
+    if (itemKey == SHUTDOWN_KEY || data.isEmpty())
+    {
+        m_tipsLabel->setText(tr("Shut down"));
+        return m_tipsLabel;
+    }
 
     m_tipsLabel->setText(QString("%1%").arg(data.value("Display"), 1, 'f', 1));
-
     return m_tipsLabel;
 }