diff --git a/src/assets/style/theme/star/index.scss b/src/assets/style/theme/star/index.scss
index 84e05a10..ade5965a 100644
--- a/src/assets/style/theme/star/index.scss
+++ b/src/assets/style/theme/star/index.scss
@@ -83,10 +83,8 @@ $theme-container-full-border-color: #d8dfea;
     .d2-header-right {
       .btn-text {
         color: #FFF;
-      }
-      .el-dropdown {
-        .el-dropdown-link {
-          color: #FFF;
+        &:hover {
+          background-color: rgba(#FFF, .1);
         }
       }
     }
diff --git a/src/assets/style/theme/theme.scss b/src/assets/style/theme/theme.scss
index 3a07e49f..3e9930d9 100644
--- a/src/assets/style/theme/theme.scss
+++ b/src/assets/style/theme/theme.scss
@@ -51,6 +51,15 @@
       height: 60px;
       display: flex;
       align-items: center;
+      .btn-text {
+        padding: 14px 12px;
+        border-radius: 4px;
+        margin: 0px !important;
+        margin-right: 10px !important;
+        &:last-child {
+          margin-right: 0px !important;
+        }
+      }
       .el-dropdown {
         user-select: none;
         cursor: pointer;
diff --git a/src/components/core/d2-layout-main/components/-header-right/components/-theme.vue b/src/components/core/d2-layout-main/components/-header-right/components/-theme.vue
index 133d5f88..3c54ae6e 100644
--- a/src/components/core/d2-layout-main/components/-header-right/components/-theme.vue
+++ b/src/components/core/d2-layout-main/components/-header-right/components/-theme.vue
@@ -1,10 +1,11 @@
 <template>
-  <el-dropdown class="d2-mr">
-    <span class="el-dropdown-link">主题</span>
-    <el-dropdown-menu slot="dropdown">
-      <el-dropdown-item>
-        <div style="height: 200px; width: 200px;"></div>
-      </el-dropdown-item>
-    </el-dropdown-menu>
-  </el-dropdown>
+  <el-tooltip
+    class="item"
+    effect="dark"
+    content="theme"
+    placement="bottom">
+    <el-button class="d2-ml-0 d2-mr btn-text" type="text">
+      <d2-icon name="gamepad"/>
+    </el-button>
+  </el-tooltip>
 </template>
diff --git a/src/components/core/d2-layout-main/components/-header-right/components/-user.vue b/src/components/core/d2-layout-main/components/-header-right/components/-user.vue
index 808dc81c..b937e9c7 100644
--- a/src/components/core/d2-layout-main/components/-header-right/components/-user.vue
+++ b/src/components/core/d2-layout-main/components/-header-right/components/-user.vue
@@ -1,6 +1,6 @@
 <template>
   <el-dropdown class="d2-mr">
-    <span class="el-dropdown-link">你好</span>
+    <span class="btn-text">你好</span>
     <el-dropdown-menu slot="dropdown">
       <el-dropdown-item @click.native="logOff"><d2-icon name="power-off"/> 注销</el-dropdown-item>
       <el-dropdown-item><d2-icon name="user-circle-o"/> 个人中心</el-dropdown-item>
diff --git a/static/image/theme-preview/star@2x.png.REMOVED.git-id b/static/image/theme-preview/star@2x.png.REMOVED.git-id
new file mode 100644
index 00000000..e6110816
--- /dev/null
+++ b/static/image/theme-preview/star@2x.png.REMOVED.git-id
@@ -0,0 +1 @@
+a2ed3f2203f8040f54c623f3b0d07ee16277d514
\ No newline at end of file