diff --git a/install/core/tpl/errors.tpl b/install/core/tpl/errors.tpl
index a5b12688ef..4625c8f86e 100644
--- a/install/core/tpl/errors.tpl
+++ b/install/core/tpl/errors.tpl
@@ -15,7 +15,7 @@
     </div>
 </div>
 <footer class="modal-footer">
-    <button class="btn btn-warning" type="button" id="re-check">{$langs['labels']['Re-check']}</button>
+    <button class="btn btn-warning btn-s-wide" type="button" id="re-check">{$langs['labels']['Re-check']}</button>
 </footer>
 <script>
     {literal}
diff --git a/install/core/tpl/main.tpl b/install/core/tpl/main.tpl
index 905c17431f..24edc85238 100644
--- a/install/core/tpl/main.tpl
+++ b/install/core/tpl/main.tpl
@@ -31,7 +31,7 @@
 
     </div>
     <footer class="modal-footer">
-            <button class="btn btn-primary" type="button" id="start">{$langs['labels']['Start']}</button>
+        <button class="btn btn-primary btn-s-wide" type="button" id="start">{$langs['labels']['Start']}</button>
     </footer>
 </form>
 <script>
diff --git a/install/core/tpl/setupConfirmation.tpl b/install/core/tpl/setupConfirmation.tpl
index e63b4d0f1b..0ec41e398a 100644
--- a/install/core/tpl/setupConfirmation.tpl
+++ b/install/core/tpl/setupConfirmation.tpl
@@ -96,9 +96,9 @@
     </div>
 </div>
 <footer class="modal-footer">
-    <button class="btn btn-default pull-left" type="button" id="back">{$langs['labels']['Back']}</button>
-    <button class="btn btn-warning" type="button" id="re-check">{$langs['labels']['Re-check']}</button>
-    <button class="btn btn-primary" type="button" id="next">{$langs['labels']['Install']}</button>
+    <button class="btn btn-default btn-s-wide pull-left" type="button" id="back">{$langs['labels']['Back']}</button>
+    <button class="btn btn-warning btn-s-wide" type="button" id="re-check">{$langs['labels']['Re-check']}</button>
+    <button class="btn btn-primary btn-s-wide" type="button" id="next">{$langs['labels']['Install']}</button>
 </footer>
 <script>
     {literal}
diff --git a/install/core/tpl/step1.tpl b/install/core/tpl/step1.tpl
index 5c99336eba..67c9c5769a 100644
--- a/install/core/tpl/step1.tpl
+++ b/install/core/tpl/step1.tpl
@@ -20,8 +20,8 @@
 
 </div>
 <footer class="modal-footer">
-    <button class="btn btn-default pull-left" type="button" id="back">{$langs['labels']['Back']}</button>
-    <button class="btn btn-primary" type="button" id="next">{$langs['labels']['Next']}</button>
+    <button class="btn btn-default btn-s-wide pull-left" type="button" id="back">{$langs['labels']['Back']}</button>
+    <button class="btn btn-primary btn-s-wide" type="button" id="next">{$langs['labels']['Next']}</button>
 </footer>
 <script>
     {literal}
diff --git a/install/core/tpl/step2.tpl b/install/core/tpl/step2.tpl
index 08bcef218c..1e09c1bead 100644
--- a/install/core/tpl/step2.tpl
+++ b/install/core/tpl/step2.tpl
@@ -63,8 +63,8 @@
     </div>
 </div>
 <footer class="modal-footer">
-    <button class="btn btn-default pull-left" type="button" id="back">{$langs['labels']['Back']}</button>
-    <button class="btn btn-primary" type="button" id="next">{$langs['labels']['Next']}</button>
+    <button class="btn btn-default btn-s-wide pull-left" type="button" id="back">{$langs['labels']['Back']}</button>
+    <button class="btn btn-primary btn-s-wide" type="button" id="next">{$langs['labels']['Next']}</button>
 </footer>
 <script>
     {literal}
diff --git a/install/core/tpl/step3.tpl b/install/core/tpl/step3.tpl
index 22b558af32..0bb9fd46e7 100644
--- a/install/core/tpl/step3.tpl
+++ b/install/core/tpl/step3.tpl
@@ -41,7 +41,7 @@
     </div>
 </div>
 <footer class="modal-footer">
-    <button class="btn btn-primary" type="button" id="next">{$langs['labels']['Next']}</button>
+    <button class="btn btn-primary btn-s-wide" type="button" id="next">{$langs['labels']['Next']}</button>
 </footer>
 <script>
     {literal}
diff --git a/install/core/tpl/step4.tpl b/install/core/tpl/step4.tpl
index 7994d79a01..03230fcf80 100644
--- a/install/core/tpl/step4.tpl
+++ b/install/core/tpl/step4.tpl
@@ -141,8 +141,8 @@
     </div>
 </div>
 <footer class="modal-footer">
-    <button class="btn btn-default pull-left" type="button" id="back">{$langs['labels']['Back']}</button>
-    <button class="btn btn-primary" type="button" id="next">{$langs['labels']['Next']}</button>
+    <button class="btn btn-default btn-s-wide pull-left" type="button" id="back">{$langs['labels']['Back']}</button>
+    <button class="btn btn-primary btn-s-wide" type="button" id="next">{$langs['labels']['Next']}</button>
 </footer>
 <script>
     {literal}
diff --git a/install/core/tpl/step5.tpl b/install/core/tpl/step5.tpl
index 3c1e6f9f6b..8f6ba6c35f 100644
--- a/install/core/tpl/step5.tpl
+++ b/install/core/tpl/step5.tpl
@@ -113,8 +113,8 @@
     </div>
 </div>
 <footer class="modal-footer">
-    <button class="btn btn-default pull-left" type="button" id="back">{$langs['labels']['Back']}</button>
-    <button class="btn btn-primary" type="button" id="next">{$langs['labels']['Next']}</button>
+    <button class="btn btn-default btn-s-wide pull-left" type="button" id="back">{$langs['labels']['Back']}</button>
+    <button class="btn btn-primary btn-s-wide" type="button" id="next">{$langs['labels']['Next']}</button>
 </footer>
 <script>
     {literal}