diff --git a/dist/treebird20.css b/dist/treebird20.css
index f4b7bc0..d48bfe5 100644
--- a/dist/treebird20.css
+++ b/dist/treebird20.css
@@ -362,8 +362,14 @@ input[type=button], input[type=submit]
 .sidebarbtn
 {
     display: block;
-    border-bottom: 1px solid #dadada;
+    border-bottom: 1px solid #e4e4e4;
     padding: 8px 8px 8px 16px;
+    color: #202020;
+}
+
+.sidebarbtn:hover
+{
+    z-index: 999;
 }
 
 .sidebarbtn.focused
@@ -1097,6 +1103,7 @@ svg.in-reply-to-icon
 /* Emojo picker */
 .emoji-picker
 {
+    overflow: hidden;
     position: absolute;
     margin-left: -15px;
     width: 260px;
@@ -1107,6 +1114,11 @@ svg.in-reply-to-icon
     box-shadow: 0px 5px 15px rgba(0, 0, 0, 0.2);
 }
 
+.emoji-picker .navigation
+{
+    border-top: 1px solid #cacaca;
+}
+
 .emoji-picker .emoji
 {
     font-size: 18px;
@@ -1285,7 +1297,7 @@ ul.large-list li a
 .tabs .tab-btn
 {
     display: block;
-    padding: 8px !important;
+    padding: 8px;
 }
 
 .tabs .tab-btn
@@ -1450,3 +1462,7 @@ ul.large-list li a
     font-weight: bold;
 }
 
+.emoji-picker .navigation .nav-btn
+{
+    padding: 4px;
+}
diff --git a/static/emoji_picker.html b/static/emoji_picker.html
index 0222ed0..39fb623 100644
--- a/static/emoji_picker.html
+++ b/static/emoji_picker.html
@@ -1,4 +1,70 @@
 <div class="emoji-picker">
+  <table class="tabs ui-table">
+    <tr>
+      <td>
+        <form action="#id" method="post">
+          <input type="hidden" name="category" value="0">
+          <input class="tab-btn btn" type="submit" value="S">
+        </form>
+      </td>
+      <td>
+        <form action="#id" method="post">
+          <input type="hidden" name="category" value="0">
+          <input class="tab-btn btn" type="submit" value="S">
+        </form>
+      </td>
+      <td>
+        <form action="#id" method="post">
+          <input type="hidden" name="category" value="0">
+          <input class="tab-btn btn" type="submit" value="S">
+        </form>
+      </td>
+      <td>
+        <form action="#id" method="post">
+          <input type="hidden" name="category" value="0">
+          <input class="tab-btn btn" type="submit" value="S">
+        </form>
+      </td>
+      <td>
+        <form action="#id" method="post">
+          <input type="hidden" name="category" value="0">
+          <input class="tab-btn btn" type="submit" value="S">
+        </form>
+      </td>
+      <td>
+        <form action="#id" method="post">
+          <input type="hidden" name="category" value="0">
+          <input class="tab-btn btn" type="submit" value="S">
+        </form>
+      </td>
+      <td>
+        <form action="#id" method="post">
+          <input type="hidden" name="category" value="0">
+          <input class="tab-btn btn" type="submit" value="S">
+        </form>
+      </td>
+      <td>
+        <form action="#id" method="post">
+          <input type="hidden" name="category" value="0">
+          <input class="tab-btn btn" type="submit" value="S">
+        </form>
+      </td>
+      <td>
+        <form action="#id" method="post">
+          <input type="hidden" name="category" value="0">
+          <input class="tab-btn btn" type="submit" value="S">
+        </form>
+      </td>
+      <td>
+        <form action="#id" method="post">
+          <input type="hidden" name="category" value="0">
+          <input class="tab-btn btn" type="submit" value="S">
+        </form>
+      </td>
+    </tr>
+  </table>
+
+  
   <div class="emoji-picker-emojos">
     %s
   </div>