diff --git a/app/views/search/_article.rhtml b/app/views/search/_article.rhtml
index ec02f90..7dac088 100644
--- a/app/views/search/_article.rhtml
+++ b/app/views/search/_article.rhtml
@@ -1,5 +1,5 @@
 <div>
-  <%= icon('cms') %>
+  <%= icon('cms', :style => 'float: left') %>
   <div class='search-result-text'>
     <div>
       <strong>
diff --git a/app/views/search/_product.rhtml b/app/views/search/_product.rhtml
index 5ce417e..63b63bd 100644
--- a/app/views/search/_product.rhtml
+++ b/app/views/search/_product.rhtml
@@ -2,7 +2,7 @@
 <%# FIXME add more information %>
 
 <div>
-  <%= icon('product') %>
+  <%= icon('product', :style => 'float: left') %>
   <div class='search-result-text'>
     <%= image_tag(hit.image.public_filename(:minor), :style => 'float:right;') if hit.image %>
       <strong>
diff --git a/app/views/search/_profile.rhtml b/app/views/search/_profile.rhtml
index fa0c2da..9c241b9 100644
--- a/app/views/search/_profile.rhtml
+++ b/app/views/search/_profile.rhtml
@@ -2,7 +2,7 @@
 <%# FIXME add more information %>
 
 <div>
-  <%= icon('person') %>
+  <%= icon('person', :style => 'float: left') %>
   <div class='search-result-text'>
     <strong>
       <%= link_to_homepage(hit.name, hit.identifier) %>
diff --git a/app/views/search/popup.rhtml b/app/views/search/popup.rhtml
index 30ab9e3..7388c23 100644
--- a/app/views/search/popup.rhtml
+++ b/app/views/search/popup.rhtml
@@ -1,18 +1,19 @@
 <h2><%= _('Search %s') % @environment.name %></h2>
 
 <% form_tag(:action => 'index') do%>
-  <div id='search-' style='text-align: center;'>
-    <%= text_field_tag('query', '', :style => 'width: 70%;') %>
-    <%= submit_tag(_('Search')) %>
+
+  <div id='search-field' style='text-align: center;'>
+    <%= text_field_tag('query', '', :size => 50) %>
+    <%= submit_button(:search, _('Search')) %>
   </div>
 
   <h3><%= _('Search options') %></h3>
 
 
-  <div>
-    <%= submit_tag(_('Search')) %>
+  <% button_bar do %>
+    <%= submit_button(:search, _('Search')) %>
     <%= lightbox_close_button(_('Close')) %>
-  </div>
+  <% end %>
 
 <% end %>
 
--
libgit2 0.21.2