diff --git a/src/components/navigation/www/navigation.jsx b/src/components/navigation/www/navigation.jsx
index ffeaf21d3..654b242a1 100644
--- a/src/components/navigation/www/navigation.jsx
+++ b/src/components/navigation/www/navigation.jsx
@@ -9,6 +9,7 @@ var sessionActions = require('../../../redux/session.js');
 
 var Api = require('../../../mixins/api.jsx');
 var Avatar = require('../../avatar/avatar.jsx');
+var Button = require('../../forms/button.jsx');
 var Dropdown = require('../../dropdown/dropdown.jsx');
 var Input = require('../../forms/input.jsx');
 var log = require('../../../lib/log.js');
@@ -215,7 +216,7 @@ var Navigation = React.createClass({
 
                     <li className="search">
                         <form action="/search/google_results" method="get">
-                            <Input type="submit" value="" />
+                            <Button type="submit" className="btn-search" />
                             <Input type="text"
                                    aria-label={formatMessage({id: 'general.search'})}
                                    placeholder={formatMessage({id: 'general.search'})}
diff --git a/src/components/navigation/www/navigation.scss b/src/components/navigation/www/navigation.scss
index 35b7a4610..188063c01 100644
--- a/src/components/navigation/www/navigation.scss
+++ b/src/components/navigation/www/navigation.scss
@@ -39,7 +39,8 @@
                 margin: 0;
             }
 
-            input {
+            input,
+            button {
                 display: inline-block;
                 margin-top: 5px;
                 outline: none;
@@ -47,19 +48,6 @@
                 background-color: $active-gray;
                 height: 14px;
 
-                &[type=submit] {
-                    position: absolute;
-                    
-                    background-color: transparent;
-                    background-image: url("/images/nav-search-glass.png");
-                    background-repeat: no-repeat;
-                    background-position: center center;     
-                    background-size: 14px 14px;
-                    
-                    width: 40px;
-                    height: 40px;
-                }
-
                 &[type=text] {
                     transition: .15s ease background-color; 
                     padding: 0;
@@ -85,6 +73,24 @@
                     }
                 }
             }
+
+            .btn-search {
+                position: absolute;
+                
+                box-shadow: none;
+                background-color: transparent;
+                background-image: url("/images/nav-search-glass.png");
+                background-repeat: no-repeat;
+                background-position: center center;     
+                background-size: 14px 14px;
+                
+                width: 40px;
+                height: 40px;
+
+                &:hover {
+                    box-shadow: none;
+                }
+            }
         }
     }