diff --git a/includes/form.inc b/includes/form.inc
index c2d3adf..e78e75f 100644
--- a/includes/form.inc
+++ b/includes/form.inc
@@ -216,6 +216,7 @@ function bootstrap_form_element_label(&$variables) {
  */
 function bootstrap_preprocess_button(&$vars) {
   $vars['element']['#attributes']['class'][] = 'btn';
+  $type_class = 'btn-default';
 
   if (isset($vars['element']['#value'])) {
     $classes = array(
@@ -245,10 +246,11 @@ function bootstrap_preprocess_button(&$vars) {
     );
     foreach ($classes as $search => $class) {
       if (strpos($vars['element']['#value'], $search) !== FALSE) {
-        $vars['element']['#attributes']['class'][] = $class;
+        $type_class = $class;
         break;
       }
     }
+    $vars['element']['#attributes']['class'][] = $type_class;
   }
 }
 
diff --git a/includes/theme.inc b/includes/theme.inc
index d03126b..5c362ab 100644
--- a/includes/theme.inc
+++ b/includes/theme.inc
@@ -126,7 +126,7 @@ function theme_bootstrap_links($variables) {
  * theme_bootstrap_btn_dropdown
  */
 function theme_bootstrap_btn_dropdown($variables) {
-  $type_class = '';
+  $type_class = 'btn-default';
   $sub_links ='';
 
   $variables['attributes']['class'][] = 'btn-group';