diff --git a/bootstrap-iconpicker/js/bootstrap-iconpicker.js b/bootstrap-iconpicker/js/bootstrap-iconpicker.js
index 11f078b..17daddf 100644
--- a/bootstrap-iconpicker/js/bootstrap-iconpicker.js
+++ b/bootstrap-iconpicker/js/bootstrap-iconpicker.js
@@ -193,16 +193,16 @@
         var op = this.options;
         var total_pages = this.totalPages();
         if (page === 1) { 
-            op.table.find('.btn-previous').addClass('disabled');
+            op.table.find('.btn-previous').addClass('disabled').prop('disabled',true);
         }
         else {
-            op.table.find('.btn-previous').removeClass('disabled');
+            op.table.find('.btn-previous').removeClass('disabled').removeProp('disabled');
         }
         if (page === total_pages || total_pages === 0) { 
-            op.table.find('.btn-next').addClass('disabled');
+            op.table.find('.btn-next').addClass('disabled').prop('disabled',true);
         }
         else {
-            op.table.find('.btn-next').removeClass('disabled');
+            op.table.find('.btn-next').removeClass('disabled').removeProp('disabled');
         }
     };
     
diff --git a/bower.json b/bower.json
index cb4474d..3300a8b 100644
--- a/bower.json
+++ b/bower.json
@@ -27,5 +27,7 @@
     "type": "git",
     "url": "http://victor-valencia.github.io/bootstrap-iconpicker"
   },
-  "main": "bootstrap-iconpicker/"  
+  "main": ["bootstrap-iconpicker/js/bootstrap-iconpicker.js",
+           "bootstrap-iconpicker/js/iconset/iconset-all.min.js",
+           "bootstrap-iconpicker/css/bootstrap-iconpicker.css"]
 }