diff --git a/admin/css/style.css b/admin/css/style.css
index a4151395..8036565e 100644
--- a/admin/css/style.css
+++ b/admin/css/style.css
@@ -440,6 +440,9 @@ button {
   content: " *";
   color: #B94A48; }
 
+.typecho-option span {
+  margin-right: 15px; }
+
 .typecho-option .description {
   margin: .5em 0 0;
   color: #999;
@@ -970,13 +973,18 @@ a.operate-reply {
 /**
  * icons
  */
+.icon-sprite-hack {
+  background: url('../images/icons-s2ae04ce87c.png'); }
+
 .i-edit, .i-delete, .i-caret-up, .i-caret-down, .i-exlink {
   width: 16px;
   height: 16px;
   display: inline-block;
   vertical-align: text-bottom;
-  background: url('../images/icons-s2ae04ce87c.png');
   background: url(../images/icons.png) no-repeat; }
+  .i-edit:hover, .i-delete:hover, .i-caret-up:hover, .i-caret-down:hover, .i-exlink:hover {
+    filter: progid:DXImageTransform.Microsoft.Alpha(Opacity=75);
+    opacity: 0.75; }
 
 .i-edit {
   background-position: 0 -32px; }
@@ -1034,32 +1042,32 @@ a.operate-reply {
 * Editor
 */
 .editor {
-  margin-bottom: -0.5em;
-  font-size: .92857em; }
+  margin-bottom: -1em; }
+
+.wmd-button-row {
+  list-style: none;
+  margin: 0;
+  padding: 0; }
+  .wmd-button-row li {
+    display: inline-block;
+    margin-right: 4px;
+    padding: 3px;
+    cursor: pointer; }
+    .wmd-button-row li:hover {
+      background-color: #E9E9E6; }
+    .wmd-button-row li.wmd-spacer {
+      height: 20px;
+      margin: 0 10px 0 6px;
+      padding: 3px 0;
+      width: 1px;
+      background: #E9E9E6;
+      cursor: default; }
 
 .editor span {
-  display: inline-block;
-  padding: 0 12px;
-  height: 25px;
-  line-height: 25px;
-  cursor: pointer; }
-  .editor span:hover {
-    background-color: #E9E9E6; }
-  .editor span:active {
-    background-color: #467B96;
-    color: #FFF; }
-
-.btnBold {
-  font-weight: bold; }
-
-.btnItalic {
-  font-style: italic; }
-
-.btnLink {
-  text-decoration: underline; }
-
-.btnDel {
-  text-decoration: line-through; }
+  display: block;
+  width: 20px;
+  height: 20px;
+  background: transparent url(../images/editor.png) no-repeat; }
 
 /**
 * Jquery Timepicker
diff --git a/admin/images/editor.png b/admin/images/editor.png
new file mode 100644
index 00000000..6b6b7d43
Binary files /dev/null and b/admin/images/editor.png differ
diff --git a/admin/images/editor/editor-bold.png b/admin/images/editor/editor-bold.png
new file mode 100644
index 00000000..7ce0d4b8
Binary files /dev/null and b/admin/images/editor/editor-bold.png differ
diff --git a/admin/images/editor/editor-code.png b/admin/images/editor/editor-code.png
new file mode 100644
index 00000000..c49bd79f
Binary files /dev/null and b/admin/images/editor/editor-code.png differ
diff --git a/admin/images/editor/editor-heading.png b/admin/images/editor/editor-heading.png
new file mode 100644
index 00000000..eb0a3c42
Binary files /dev/null and b/admin/images/editor/editor-heading.png differ
diff --git a/admin/images/editor/editor-hr.png b/admin/images/editor/editor-hr.png
new file mode 100644
index 00000000..b764ded2
Binary files /dev/null and b/admin/images/editor/editor-hr.png differ
diff --git a/admin/images/editor/editor-image.png b/admin/images/editor/editor-image.png
new file mode 100644
index 00000000..58208e9d
Binary files /dev/null and b/admin/images/editor/editor-image.png differ
diff --git a/admin/images/editor/editor-italic.png b/admin/images/editor/editor-italic.png
new file mode 100644
index 00000000..707aca31
Binary files /dev/null and b/admin/images/editor/editor-italic.png differ
diff --git a/admin/images/editor/editor-link.png b/admin/images/editor/editor-link.png
new file mode 100644
index 00000000..f5f7853f
Binary files /dev/null and b/admin/images/editor/editor-link.png differ
diff --git a/admin/images/editor/editor-olist.png b/admin/images/editor/editor-olist.png
new file mode 100644
index 00000000..9a5b88ea
Binary files /dev/null and b/admin/images/editor/editor-olist.png differ
diff --git a/admin/images/editor/editor-quote.png b/admin/images/editor/editor-quote.png
new file mode 100644
index 00000000..a5804946
Binary files /dev/null and b/admin/images/editor/editor-quote.png differ
diff --git a/admin/images/editor/editor-redo.png b/admin/images/editor/editor-redo.png
new file mode 100644
index 00000000..b22468d7
Binary files /dev/null and b/admin/images/editor/editor-redo.png differ
diff --git a/admin/images/editor/editor-ulist.png b/admin/images/editor/editor-ulist.png
new file mode 100644
index 00000000..e7948be5
Binary files /dev/null and b/admin/images/editor/editor-ulist.png differ
diff --git a/admin/images/editor/editor-undo.png b/admin/images/editor/editor-undo.png
new file mode 100644
index 00000000..75925fc8
Binary files /dev/null and b/admin/images/editor/editor-undo.png differ
diff --git a/admin/manage-medias.php b/admin/manage-medias.php
index acc63e55..36bd7674 100644
--- a/admin/manage-medias.php
+++ b/admin/manage-medias.php
@@ -63,7 +63,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                                 <td><a href="<?php $options->adminUrl('manage-comments.php?cid=' . $attachments->cid); ?>" class="balloon-button size-<?php echo Typecho_Common::splitByCount($attachments->commentsNum, 1, 10, 20, 50, 100); ?>"><?php $attachments->commentsNum(); ?></a></td>
                                 <td>
                                 <a class="typecho-mime typecho-mime-<?php echo $mime; ?>" href="<?php $options->adminUrl('media.php?cid=' . $attachments->cid); ?>"><?php $attachments->title(); ?></a>
-                                <a class="right" href="<?php $attachments->permalink(); ?>"><i class="i-exlink" title="<?php _e('浏览 %s', $attachments->title); ?>"></i></a>
+                                <a href="<?php $attachments->permalink(); ?>"><i class="i-exlink" title="<?php _e('浏览 %s', $attachments->title); ?>"></i></a>
                                 </td>
                                 <td><?php $attachments->author(); ?></td>
                                 <td>
diff --git a/admin/manage-metas.php b/admin/manage-metas.php
index 83631078..423e35e7 100644
--- a/admin/manage-metas.php
+++ b/admin/manage-metas.php
@@ -60,7 +60,7 @@ include 'menu.php';
                                 <tr id="mid-<?php $categories->theId(); ?>">
                                     <td><input type="checkbox" value="<?php $categories->mid(); ?>" name="mid[]"/></td>
                                     <td><a href="<?php echo $request->makeUriByRequest('mid=' . $categories->mid); ?>"><?php $categories->name(); ?></a>
-                                    <a class="right" href="<?php $categories->permalink(); ?>"><i class="i-exlink" title="<?php _e('浏览 %s', $categories->name); ?>"></i></a>
+                                    <a href="<?php $categories->permalink(); ?>"><i class="i-exlink" title="<?php _e('浏览 %s', $categories->name); ?>"></i></a>
                                     </td>
                                     <td><?php $categories->slug(); ?></td>
                                     <td>
diff --git a/admin/manage-pages.php b/admin/manage-pages.php
index 6c025614..3d8989b4 100644
--- a/admin/manage-pages.php
+++ b/admin/manage-pages.php
@@ -73,7 +73,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                                 }
                                 ?>
                                 <?php if ('page_draft' != $pages->type): ?>
-                                <a class="right" href="<?php $pages->permalink(); ?>"><i class="i-exlink" title="<?php _e('浏览 %s', htmlspecialchars($pages->title)); ?>"></i></a>
+                                <a href="<?php $pages->permalink(); ?>"><i class="i-exlink" title="<?php _e('浏览 %s', htmlspecialchars($pages->title)); ?>"></i></a>
                                 <?php endif; ?>
                                 </td>
                                 <td><?php $pages->slug(); ?></td>
diff --git a/admin/manage-posts.php b/admin/manage-posts.php
index e43ff199..ade73e7a 100644
--- a/admin/manage-posts.php
+++ b/admin/manage-posts.php
@@ -82,7 +82,7 @@ $stat = Typecho_Widget::widget('Widget_Stat');
                             }
                             ?>
                             <?php if ('post_draft' != $posts->type): ?>
-                            <a class="right" href="<?php $posts->permalink(); ?>"><i class="i-exlink" title="<?php _e('浏览 %s', htmlspecialchars($posts->title)); ?>" /></i></a>
+                            <a href="<?php $posts->permalink(); ?>"><i class="i-exlink" title="<?php _e('浏览 %s', htmlspecialchars($posts->title)); ?>" /></i></a>
                             <?php endif; ?>
                             </td>
                             <td><a href="<?php $options->adminUrl('manage-posts.php?uid=' . $posts->author->uid); ?>"><?php $posts->author(); ?></a></td>
diff --git a/admin/manage-users.php b/admin/manage-users.php
index 39d149c9..1b65f148 100644
--- a/admin/manage-users.php
+++ b/admin/manage-users.php
@@ -56,7 +56,7 @@ include 'menu.php';
                                 <td><input type="checkbox" value="<?php $users->uid(); ?>" name="uid[]"/></td>
                                 <td><a href="<?php $options->adminUrl('manage-posts.php?uid=' . $users->uid); ?>" class="balloon-button left size-<?php echo Typecho_Common::splitByCount($users->postsNum, 1, 10, 20, 50, 100); ?>"><?php $users->postsNum(); ?></a></td>
                                 <td><a href="<?php $options->adminUrl('user.php?uid=' . $users->uid); ?>"><?php $users->name(); ?></a>
-                                <a class="right" href="<?php $users->permalink(); ?>"><i class="i-exlink" title="<?php _e('浏览 %s', $users->screenName); ?>"></i></a>
+                                <a href="<?php $users->permalink(); ?>"><i class="i-exlink" title="<?php _e('浏览 %s', $users->screenName); ?>"></i></a>
                                 </td>
                                 <td><?php $users->screenName(); ?></td>
                                 <td><?php if($users->mail): ?><a href="mailto:<?php $users->mail(); ?>"><?php $users->mail(); ?></a><?php else: _e('暂无'); endif; ?></td>
diff --git a/admin/scss/_icons.scss b/admin/scss/_icons.scss
index 7cc82791..6ef67c9d 100644
--- a/admin/scss/_icons.scss
+++ b/admin/scss/_icons.scss
@@ -4,13 +4,19 @@
 
 $icons: sprite-map("icons/*.png");
 
+.icon-sprite-hack {
+  background: $icons;
+}
+
 %i-16 {
   width: 16px;
   height: 16px;
   display: inline-block;
   vertical-align: text-bottom;
-  background: $icons;
   background: url(../images/icons.png) no-repeat;
+  &:hover {
+    @include opacity(0.75);
+  }
 }
 
 .i-edit {
diff --git a/admin/scss/components/_editor.scss b/admin/scss/components/_editor.scss
index 80c74a74..ff271bbf 100644
--- a/admin/scss/components/_editor.scss
+++ b/admin/scss/components/_editor.scss
@@ -2,21 +2,36 @@
 * Editor
 */
 .editor {
-  margin-bottom: -0.5em;
-  font-size: .92857em;
+  margin-bottom: -1em;
 }
+
+.wmd-button-row {
+  list-style: none;
+  margin: 0;
+  padding: 0;
+
+  li {
+    display: inline-block;
+    margin-right: 4px;
+    padding: 3px;
+    cursor: pointer;
+    &:hover {
+      background-color: #E9E9E6;
+    }
+    &.wmd-spacer {
+      height: 20px;
+      margin: 0 10px 0 6px;
+      padding: 3px 0;
+      width: 1px;
+      background: #E9E9E6;
+      cursor: default;
+    }
+  }
+}
+
 .editor span {
-  display: inline-block;
-  padding: 0 12px;
-  height: 25px;
-  line-height: 25px;
-  cursor: pointer;
-
-  &:hover { background-color: #E9E9E6; }
-  &:active { background-color: #467B96; color: #FFF; }
-}
-
-.btnBold { font-weight: bold; }
-.btnItalic { font-style: italic; }
-.btnLink { text-decoration: underline; }
-.btnDel { text-decoration: line-through; }
\ No newline at end of file
+  display: block;
+  width: 20px;
+  height: 20px;
+  background: transparent url(../images/editor.png) no-repeat;
+}
\ No newline at end of file
diff --git a/admin/scss/style.scss b/admin/scss/style.scss
index be2ebdce..21832bed 100644
--- a/admin/scss/style.scss
+++ b/admin/scss/style.scss
@@ -153,7 +153,7 @@ a.button:hover, a.balloon-button:hover {
 }
 .typecho-option label.typecho-label+input {
 }
-
+.typecho-option span { margin-right: 15px; }
 .typecho-option .description {
   margin: .5em 0 0;
   color: #999;
diff --git a/admin/write-js.php b/admin/write-js.php
index 9d1ef9ca..cb2880e5 100644
--- a/admin/write-js.php
+++ b/admin/write-js.php
@@ -160,7 +160,7 @@ $(document).ready(function() {
 <script src="<?php $options->adminUrl('js/markdown.js?v=' . $suffixVersion); ?>"></script>
 <script>
 $(document).ready(function () {
-    var toolbar = $('<p class="editor" id="wmd-button-bar" />').insertBefore($('#text').parent())
+    var toolbar = $('<div class="editor" id="wmd-button-bar" />').insertBefore($('#text').parent())
         preview = $('<div id="wmd-preview" />').insertAfter('.submit');
 
     var converter = new Showdown.converter(), options = {};