diff --git a/Grid/Render/YesNo.php b/Grid/Render/YesNo.php
index 313d41f..1d87434 100644
--- a/Grid/Render/YesNo.php
+++ b/Grid/Render/YesNo.php
@@ -26,9 +26,9 @@ public function render()
             return (int) $this->getValue();
         } else {
             if ($this->getValue() && $this->getShowYes()) {
-                return '<i class="icon-ok"></i>';
+                return '<i class="glyphicon glyphicon-ok"></i>';
             } else if ($this->getShowNo()) {
-                return '<i class="icon-remove"></i>';
+                return '<i class="glyphicon glyphicon-remove"></i>';
             }
         }
 
diff --git a/Resources/public/js/grid.js b/Resources/public/js/grid.js
index 9da23d9..c2b0538 100644
--- a/Resources/public/js/grid.js
+++ b/Resources/public/js/grid.js
@@ -189,9 +189,9 @@
             })
 
             if (this.sortOrder == 'DESC') {
-                element.append(' <i class="icon-chevron-down"></i>')
+                element.append(' <i class="glyphicon glyphicon-chevron-down"></i>')
             } else {
-                element.append(' <i class="icon-chevron-up"></i>')
+                element.append(' <i class="glyphicon glyphicon-chevron-up"></i>')
             }
 
             return this
diff --git a/Resources/views/block.html.twig b/Resources/views/block.html.twig
index 7cc6236..5ddd22b 100644
--- a/Resources/views/block.html.twig
+++ b/Resources/views/block.html.twig
@@ -29,27 +29,27 @@
                     <tr class="row-footer">
                         <td colspan="{{ view.grid.getColumnsCount }}">
                             {# Without submit button the form is not submitted with the enter key #}
-                            <button id="refresh-button" class="btn btn-mini" type="submit">
-                                <i class="icon-refresh"></i> {% trans %}Update{% endtrans %}
+                            <button id="refresh-button" class="btn btn-default btn-xs" type="submit">
+                                <i class="glyphicon glyphicon-refresh"></i> {% trans %}Update{% endtrans %}
                             </button>
 
-                            <button id="refresh-filters-button" class="btn btn-mini" type="button">
-                                <i class="icon-filter"></i> {% trans %}Refresh Filters{% endtrans %}
+                            <button id="refresh-filters-button" class="btn btn-default btn-xs" type="button">
+                                <i class="glyphicon glyphicon-filter"></i> {% trans %}Refresh Filters{% endtrans %}
                             </button>
 
                             {% if view.grid.exportable %}
-                                <button id="export-button" class="btn btn-mini" type="button">
-                                    <i class="icon-download"></i> {% trans %}Export{% endtrans %}
+                                <button id="export-button" class="btn btn-default btn-xs" type="button">
+                                    <i class="glyphicon glyphicon-download"></i> {% trans %}Export{% endtrans %}
                                 </button>
                             {% endif %}
 
                             <div id="pagination" class="pull-right">
-                                <button id="pagination-back-button" class="btn btn-mini" type="button">
-                                    <i class="icon-chevron-left"></i>
+                                <button id="pagination-back-button" class="btn btn-default btn-xs" type="button">
+                                    <i class="glyphicon glyphicon-chevron-left"></i>
                                 </button>
                                 <input id="pagination-page" type="text" value="0">
-                                <button id="pagination-forward-button" class="btn btn-mini" type="button">
-                                    <i class="icon-chevron-right"></i>
+                                <button id="pagination-forward-button" class="btn btn-default btn-xs" type="button">
+                                    <i class="glyphicon glyphicon-chevron-right"></i>
                                 </button>
 
                                 {% trans %}of{% endtrans %}