diff --git a/includes/form.inc b/includes/form.inc
index fa52b74..2fc3266 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -50,6 +50,7 @@ function bootstrap_form_search_block_form_alter(&$form, &$form_state) {
   $form['search_block_form']['#title'] = '';
   $form['search_block_form']['#attributes']['class'][] = 'search-query';
   $form['search_block_form']['#attributes']['class'][] = 'col-sm-2';
+  $form['search_block_form']['#attributes']['class'][] = 'form-control';
   $form['search_block_form']['#attributes']['placeholder'] = t('Search');
 
   // Hide the default button from display and implement a theme wrapper to add
diff --git a/template.php b/template.php
index 4372937..20e2652 100755
--- a/template.php
+++ b/template.php
@@ -261,13 +261,20 @@ function bootstrap_process_block(&$variables, $hook) {
  * @ingroup themable
  */
 function bootstrap_bootstrap_search_form_wrapper(&$variables) {
-  $output = '<div class="input-append">';
+  $output = '<div class="input-group">';
   $output .= $variables['element']['#children'];
-  $output .= '<button type="submit" class="btn">';
-  $output .= '<i class="icon-search"></i>';
-  $output .= '<span class="element-invisible">' . t('Search') . '</span>';
+  $output .= '<span class="input-group-btn">';
+  // fixme: dunno why padding is off by 2 px...
+  $output .= '<button style="padding-top: 5px; padding-bottom: 5px" class="btn btn-default" type="button">';
+  if (icon_bundles('bootstrap')) {
+    $output .= '<i class="glyphicon glyphicon-search"></i>';
+  } else {
+    $output .= '<i class="icon-search"></i>';
+  }
   $output .= '</button>';
+  $output .= '</span>';
   $output .= '</div>';
+
   return $output;
  }
 
diff --git a/templates/search-block-form.tpl.php b/templates/search-block-form.tpl.php
new file mode 100644
index 0000000..aa19949
--- /dev/null
+++ b/templates/search-block-form.tpl.php
@@ -0,0 +1,6 @@
+<div>
+  <?php if (empty($variables['form']['#block']->subject)): ?>
+    <h2 class="element-invisible"><?php print t('Search form'); ?></h2>
+  <?php endif; ?>
+  <?php print $search_form; ?>
+</div>