diff --git a/css/glowingbear.css b/css/glowingbear.css
index e55dbb6..ba74539 100644
--- a/css/glowingbear.css
+++ b/css/glowingbear.css
@@ -50,9 +50,14 @@ td.message {
 
 #sendMessage {
     width: 100%;
-    height: 36px;
+    height: 35px;
     resize: none;
 }
+
+#sendMessage:focus, #sendMessage:active {
+    border-bottom: 2px solid #555;
+}
+
 .footer button {
     border-radius: 0;
 }
diff --git a/css/themes/dark.css b/css/themes/dark.css
index 574ac5f..1fbbddb 100644
--- a/css/themes/dark.css
+++ b/css/themes/dark.css
@@ -20,6 +20,10 @@ html {
     color: #333;
 }
 
+.nav-pills > li.active > a, .nav-pills > li.active > a:hover, .nav-pills > li.active > a:focus {
+    background-color: #555;
+}
+
 /* fix for mobile firefox which ignores :hover */
 .nav-pills > li > a:active, .nav-pills > li > a:active span {
     background-color: #eee;
@@ -39,6 +43,15 @@ tr.bufferline:hover {
     color: black;
 }
 
+.btn-primary {
+    background-color: #555;
+    border-color: #444;
+}
+.btn-primary:hover {
+    background-color: #666;
+    border-color: #555;
+}
+
 li.notification {
     color: green;
 }
@@ -55,12 +68,17 @@ li.notification {
     background-color:rgba(0, 0, 0, 0.5)
 }
 
-input[type=text], input[type=password], #sendMessage, .badge {
+input[type=text], input[type=password], #sendMessage, .badge, .btn-send {
     color: #ccc;
     box-shadow: 0px 1px 0px rgba(255, 255, 255, 0.1), 0px 1px 7px 0px rgba(0, 0, 0, 0.8) inset;
     background: none repeat scroll 0% 0% rgba(0, 0, 0, 0.3);
 }
 
+.btn-send:hover, .btn-send:focus {
+    background-color: #555;
+    color: white;
+}
+
 #connection-infos {
     color: #aaa;
 }
@@ -88,6 +106,9 @@ input[type=text], input[type=password], #sendMessage, .badge {
 #topbar .actions {
     background: #282828;
 }
+#topbar a {
+    color: #666;
+}
 
 #topbar, #sidebar, .panel, .dropdown-menu, .modal-content {
     background: #282828;
diff --git a/css/themes/light.css b/css/themes/light.css
index 73bc97a..b292136 100644
--- a/css/themes/light.css
+++ b/css/themes/light.css
@@ -22,6 +22,11 @@ html {
     background-color: #222;
 }
 
+.btn-send {
+    background: none repeat scroll 0% 0% rgba(255, 255, 255, 0.3);
+    color: #428BCA;
+}
+
 tr.bufferline:hover {
     background-color: #efefef;
 }
diff --git a/directives/input.html b/directives/input.html
index afcf580..9b23817 100644
--- a/directives/input.html
+++ b/directives/input.html
@@ -3,7 +3,7 @@
     <textarea id="{{inputId}}" class="form-control favorite-font" ng-trim="false" rows="1" ng-change="inputChanged()" autocomplete="on" ng-model="command" ng-focus="hideSidebar()">
     </textarea>
     <span class="input-group-btn">
-      <button class="btn btn-default btn-primary unselectable">Send</button>
+      <button class="btn btn-send unselectable"><i class="glyphicon glyphicon-send"></i></button>
     </span>
   </div>
 </form>