diff --git a/debian/changelog b/debian/changelog
index 50c15873b..01cd3b686 100644
--- a/debian/changelog
+++ b/debian/changelog
@@ -1,3 +1,14 @@
+dde-shell (0.0.20) unstable; urgency=medium
+
+  * fix: brightness-popup's setting button no blur effect and txt color has error
+    Thanks to ZhaoYingZhen(Issue: https://github.com/linuxdeepin/developer-center/issues/8470)(Influence: brightness-popup's setting button)
+  * fix: tray plugin mouse right click cause dock crash
+    Thanks to ZhaoYingZhen(Issue: https://github.com/linuxdeepin/developer-center/issues/8506)(Influence: tray plugin menu display)
+  * fix: onboard has same icon with fcitx(issue: #8557)
+  * chore: bump version 0.0.20
+
+ -- tsic404 <liuheng@deepin.org>  Tue, 14 May 2024 10:20:00 +0800
+
 dde-shell (0.0.19) unstable; urgency=medium
 
   * feat: remove uos-ai plugin when uos ai uninstalled
diff --git a/panels/dock/tray/frame/package/icons/onboard-symbolic.dci b/panels/dock/tray/frame/package/icons/onboard-symbolic.dci
new file mode 100644
index 000000000..fc4f55e4a
Binary files /dev/null and b/panels/dock/tray/frame/package/icons/onboard-symbolic.dci differ
diff --git a/panels/dock/tray/plugins/onboard/CMakeLists.txt b/panels/dock/tray/plugins/onboard/CMakeLists.txt
index 7cf697d09..5e69f0146 100644
--- a/panels/dock/tray/plugins/onboard/CMakeLists.txt
+++ b/panels/dock/tray/plugins/onboard/CMakeLists.txt
@@ -20,7 +20,7 @@ find_package(Dtk6Gui REQUIRED)
 find_package(Dtk6Widget REQUIRED)
 
 add_definitions("${QT_DEFINITIONS} -DQT_PLUGIN")
-add_library(${PLUGIN_NAME} SHARED ${SRCS} onboard.qrc)
+add_library(${PLUGIN_NAME} SHARED ${SRCS})
 set_target_properties(${PLUGIN_NAME} PROPERTIES LIBRARY_OUTPUT_DIRECTORY ../)
 
 target_include_directories(${PLUGIN_NAME} PUBLIC ${Qt6DBus_INCLUDE_DIRS}
diff --git a/panels/dock/tray/plugins/onboard/icon/keyboard-symbolic-dark.svg b/panels/dock/tray/plugins/onboard/icon/keyboard-symbolic-dark.svg
deleted file mode 100644
index 1f42f65fb..000000000
--- a/panels/dock/tray/plugins/onboard/icon/keyboard-symbolic-dark.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>input-keyboard</title>
-    <g id="input-keyboard" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M12.8,1 C14.0150264,1 15,1.98497357 15,3.20000005 L15,12.8 C15,14.0150264 14.0150264,15 12.8,15 L3.20000005,15 C1.98497357,15 1,14.0150264 1,12.8 L1,3.20000005 C1,1.98497357 1.98497357,1 3.20000005,1 L12.8,1 Z M12.8,2 L3.20000005,2 C2.53725832,2 2,2.53725832 2,3.20000005 L2,12.8 C2,13.4627417 2.53725832,14 3.20000005,14 L12.8,14 C13.4627417,14 14,13.4627417 14,12.8 L14,3.20000005 C14,2.53725832 13.4627417,2 12.8,2 Z M12,10 L12,12 L4,12 L4,10 L12,10 Z M5,7 L5,9 L3,9 L3,7 L5,7 Z M9,7 L9,9 L6,9 L6,7 L9,7 Z M13,7 L13,9 L10,9 L10,7 L13,7 Z M7,4 L7,6 L3,6 L3,4 L7,4 Z M10,4 L10,6 L8,6 L8,4 L10,4 Z M13,4 L13,6 L11,6 L11,4 L13,4 Z" id="形状" fill="#FFFFFF"></path>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/panels/dock/tray/plugins/onboard/icon/keyboard-symbolic.svg b/panels/dock/tray/plugins/onboard/icon/keyboard-symbolic.svg
deleted file mode 100644
index 1024d4064..000000000
--- a/panels/dock/tray/plugins/onboard/icon/keyboard-symbolic.svg
+++ /dev/null
@@ -1,7 +0,0 @@
-<?xml version="1.0" encoding="UTF-8"?>
-<svg width="16px" height="16px" viewBox="0 0 16 16" version="1.1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink">
-    <title>input-keyboard-dark</title>
-    <g id="input-keyboard-dark" stroke="none" stroke-width="1" fill="none" fill-rule="evenodd">
-        <path d="M12.8,1 C14.0150264,1 15,1.98497357 15,3.20000005 L15,12.8 C15,14.0150264 14.0150264,15 12.8,15 L3.20000005,15 C1.98497357,15 1,14.0150264 1,12.8 L1,3.20000005 C1,1.98497357 1.98497357,1 3.20000005,1 L12.8,1 Z M12.8,2 L3.20000005,2 C2.53725832,2 2,2.53725832 2,3.20000005 L2,12.8 C2,13.4627417 2.53725832,14 3.20000005,14 L12.8,14 C13.4627417,14 14,13.4627417 14,12.8 L14,3.20000005 C14,2.53725832 13.4627417,2 12.8,2 Z M12,10 L12,12 L4,12 L4,10 L12,10 Z M5,7 L5,9 L3,9 L3,7 L5,7 Z M9,7 L9,9 L6,9 L6,7 L9,7 Z M13,7 L13,9 L10,9 L10,7 L13,7 Z M7,4 L7,6 L3,6 L3,4 L7,4 Z M10,4 L10,6 L8,6 L8,4 L10,4 Z M13,4 L13,6 L11,6 L11,4 L13,4 Z" id="形状" fill="#000000"></path>
-    </g>
-</svg>
\ No newline at end of file
diff --git a/panels/dock/tray/plugins/onboard/onboard.qrc b/panels/dock/tray/plugins/onboard/onboard.qrc
deleted file mode 100644
index 8747d5121..000000000
--- a/panels/dock/tray/plugins/onboard/onboard.qrc
+++ /dev/null
@@ -1,6 +0,0 @@
-<RCC>
-    <qresource prefix="/icons">
-        <file>icon/keyboard-symbolic-dark.svg</file>
-        <file>icon/keyboard-symbolic.svg</file>
-    </qresource>
-</RCC>
diff --git a/panels/dock/tray/plugins/onboard/onboarditem.cpp b/panels/dock/tray/plugins/onboard/onboarditem.cpp
index 6f3612922..ee684e366 100644
--- a/panels/dock/tray/plugins/onboard/onboarditem.cpp
+++ b/panels/dock/tray/plugins/onboard/onboarditem.cpp
@@ -31,15 +31,7 @@ OnboardItem::OnboardItem(QWidget *parent)
 
 QIcon OnboardItem::iconPixmap(QSize size, DGuiApplicationHelper::ColorType themeType) const
 {
-    QString iconName;
-    if (std::min(width(), height()) <= PLUGIN_BACKGROUND_MIN_SIZE
-        || themeType == DGuiApplicationHelper::LightType) {
-        iconName = ":/icons/icon/keyboard-symbolic.svg";
-    } else {
-        iconName = ":/icons/icon/keyboard-symbolic-dark.svg";
-    }
-
-    return QIcon(iconName);
+    return QIcon::fromTheme("onboard-symbolic");
 }
 
 void OnboardItem::paintEvent(QPaintEvent *e)
@@ -88,15 +80,7 @@ void OnboardItem::paintEvent(QPaintEvent *e)
         painter.fillPath(path, color);
     }
 
-    QString iconName;
-    if (std::min(width(), height()) <= PLUGIN_BACKGROUND_MIN_SIZE
-        || DGuiApplicationHelper::instance()->themeType() == DGuiApplicationHelper::LightType) {
-        iconName = ":/icons/icon/keyboard-symbolic.svg";
-    } else {
-        iconName = ":/icons/icon/keyboard-symbolic-dark.svg";
-    }
-
-    const QPixmap &pixmap = loadSvg(iconName, QSize(PLUGIN_ICON_MAX_SIZE, PLUGIN_ICON_MAX_SIZE));
+    const QPixmap &pixmap = QIcon::fromTheme("onboard-symbolic").pixmap(PLUGIN_ICON_MAX_SIZE, PLUGIN_ICON_MAX_SIZE);
     painter.setOpacity(1);
     const QRectF &rf = QRectF(rect());
     const QRectF &rfp = QRectF(pixmap.rect());