diff --git a/css/themes/base16-default.css b/css/themes/base16-default.css
index e01bfcf..4348b79 100644
--- a/css/themes/base16-default.css
+++ b/css/themes/base16-default.css
@@ -335,9 +335,9 @@ input[type=text]:-moz-placeholder, input[type=password]:-moz-placeholder { /* Fi
     background: var(--base08);
 }
 
-.is-desktop-ui .btn-complete-nick:hover, .btn-complete-nick:focus,
-.is-desktop-ui .btn-send:hover, .btn-send:focus,
-.is-desktop-ui .btn-send-image:hover, .btn-send-image:focus {
+.btn-complete-nick:hover, .btn-complete-nick:focus,
+.btn-send:hover, .btn-send:focus,
+.btn-send-image:hover, .btn-send-image:focus {
     background-color: var(--base07);
     color: var(--base01);
 }
@@ -345,6 +345,7 @@ input[type=text]:-moz-placeholder, input[type=password]:-moz-placeholder { /* Fi
 .is-mobile-ui .btn-complete-nick:hover,
 .is-mobile-ui .btn-send:hover,
 .is-mobile-ui .btn-send-image:hover {
+    background: var(--base01);
     color: var(--base05);
 }
 
diff --git a/css/themes/blue.css b/css/themes/blue.css
index 39bb4d5..c690ef2 100644
--- a/css/themes/blue.css
+++ b/css/themes/blue.css
@@ -93,9 +93,9 @@ input[type=text], input[type=password], #sendMessage, .badge, .btn-send, .btn-se
     background: none repeat scroll 0% 0% rgba(0, 0, 0, 0.3);
 }
 
-.is-desktop-ui .btn-complete-nick:hover, .btn-complete-nick:focus,
-.is-desktop-ui .btn-send:hover, .btn-send:focus,
-.is-desktop-ui .btn-send-image:hover, .btn-send-image:focus {
+.btn-complete-nick:hover, .btn-complete-nick:focus,
+.btn-send:hover, .btn-send:focus,
+.btn-send-image:hover, .btn-send-image:focus {
     background-color: #555;
     color: white;
 }
@@ -103,6 +103,7 @@ input[type=text], input[type=password], #sendMessage, .badge, .btn-send, .btn-se
 .is-mobile-ui .btn-complete-nick:hover,
 .is-mobile-ui .btn-send:hover,
 .is-mobile-ui .btn-send-image:hover {
+    background: none repeat scroll 0% 0% rgba(0, 0, 0, 0.3);
     color: #ccc;
 }
 
diff --git a/css/themes/dark.css b/css/themes/dark.css
index 6812edf..485df07 100644
--- a/css/themes/dark.css
+++ b/css/themes/dark.css
@@ -87,9 +87,9 @@ input[type=text], input[type=password], #sendMessage, .badge, .btn-send, .btn-se
     background: none repeat scroll 0% 0% rgba(0, 0, 0, 0.3);
 }
 
-.is-desktop-ui .btn-complete-nick:hover, .btn-complete-nick:focus,
-.is-desktop-ui .btn-send:hover, .btn-send:focus,
-.is-desktop-ui .btn-send-image:hover, .btn-send-image:focus {
+.btn-complete-nick:hover, .btn-complete-nick:focus,
+.btn-send:hover, .btn-send:focus,
+.btn-send-image:hover, .btn-send-image:focus {
     background-color: #555;
     color: white;
 }
@@ -97,6 +97,7 @@ input[type=text], input[type=password], #sendMessage, .badge, .btn-send, .btn-se
 .is-mobile-ui .btn-complete-nick:hover,
 .is-mobile-ui .btn-send:hover,
 .is-mobile-ui .btn-send-image:hover {
+    background: none repeat scroll 0% 0% rgba(0, 0, 0, 0.3);
     color: #ccc;
 }
 
diff --git a/directives/input.html b/directives/input.html
index 48c0877..230fbcd 100644
--- a/directives/input.html
+++ b/directives/input.html
@@ -1,4 +1,4 @@
-<form class="form form-horizontal" ng-class="utils.isMobileUi() ? 'is-mobile-ui' : 'is-desktop-ui'" id="inputform" ng-submit="sendMessage()" imgur-drop>
+<form class="form form-horizontal" ng-class="{'is-mobile-ui': utils.isMobileUi()}" id="inputform" ng-submit="sendMessage()" imgur-drop>
   <div class="input-group">
     <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>