diff --git a/install/core/tpl/errors.tpl b/install/core/tpl/errors.tpl
index 3a43db3eeb..981e94782c 100644
--- a/install/core/tpl/errors.tpl
+++ b/install/core/tpl/errors.tpl
@@ -1,6 +1,5 @@
 <div class="panel-body body">
     <div id="msg-box" class="alert alert-danger">{$errors}</div>
-    <div class="loading-icon hide"></div>
     <form id="nav">
         <div class="row">
             <div class=" col-md-13">
@@ -10,6 +9,11 @@
         </div>
     </form>
 </div>
+<div class="loading-panel hide">
+    <div class="text-right">
+        <span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
+    </div>
+</div>
 <footer class="modal-footer">
     <button class="btn btn-warning" type="button" id="re-check">{$langs['labels']['Re-check']}</button>
 </footer>
diff --git a/install/core/tpl/setupConfirmation.tpl b/install/core/tpl/setupConfirmation.tpl
index 2387d691c6..99f1c92c88 100644
--- a/install/core/tpl/setupConfirmation.tpl
+++ b/install/core/tpl/setupConfirmation.tpl
@@ -88,13 +88,14 @@
             <div class="cell cell-website pull-right" align="right">
                 <a target="_blank" href="https://www.espocrm.com/documentation/administration/server-configuration/" style="font-weight:bold;">{$langs['labels']['Configuration Instructions']}</a>
             </div>
-
-            <br>
-
-            <div class="loading-icon hide"></div>
-
         </div>
     </form>
+    <div class="space"></div>
+</div>
+<div class="loading-panel hide">
+    <div class="text-right">
+        <span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
+    </div>
 </div>
 <footer class="modal-footer">
     <button class="btn btn-default" type="button" id="back">{$langs['labels']['Back']}</button>
diff --git a/install/core/tpl/step2.tpl b/install/core/tpl/step2.tpl
index e4483247e1..e90aa6263a 100644
--- a/install/core/tpl/step2.tpl
+++ b/install/core/tpl/step2.tpl
@@ -35,9 +35,9 @@
             <div class=" col-md-6">
                 <div class="row">
                     <div class="cell cell-website col-sm-12 form-group">
-                                <div class="label-description">
-                                    {$langs['labels']['Database Settings Description']}
-                                </div>
+                        <div class="label-description">
+                            {$langs['labels']['Database Settings Description']}
+                        </div>
                     </div>
                 </div>
             </div>
@@ -45,21 +45,23 @@
 
     </form>
 
-    <div class="loading-icon hide"></div>
-
     <div class="row">
-            <div class=" col-md-6">
-                <div class="row">
-                    <div class="cell cell-website col-sm-12 form-group">
-                        <div class="btn-panel">
-                            <button class="btn btn-default" type="button" id="test-connection">{$langs['labels']['Test settings']}</button>
-                        </div>
+        <div class=" col-md-6">
+            <div class="row">
+                <div class="cell cell-website col-sm-12 form-group">
+                    <div class="btn-panel">
+                        <button class="btn btn-default" type="button" id="test-connection">{$langs['labels']['Test settings']}</button>
                     </div>
                 </div>
             </div>
         </div>
+     </div>
+</div>
+<div class="loading-panel hide">
+    <div class="text-right">
+        <span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
+    </div>
 </div>
-
 <footer class="modal-footer">
     <button class="btn btn-default" type="button" id="back">{$langs['labels']['Back']}</button>
     <button class="btn btn-primary" type="button" id="next">{$langs['labels']['Next']}</button>
diff --git a/install/core/tpl/step3.tpl b/install/core/tpl/step3.tpl
index 1648a134a5..23231f1b9a 100644
--- a/install/core/tpl/step3.tpl
+++ b/install/core/tpl/step3.tpl
@@ -1,6 +1,5 @@
 <div class="panel-body body">
     <div id="msg-box" class="alert hide"></div>
-    <div class="loading-icon hide"></div>
     <form id="nav">
         <div class="row">
 
@@ -36,6 +35,11 @@
         </div>
     </form>
 </div>
+<div class="loading-panel hide">
+    <div class="text-right">
+        <span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
+    </div>
+</div>
 <footer class="modal-footer">
     <button class="btn btn-primary" type="button" id="next">{$langs['labels']['Next']}</button>
 </footer>
diff --git a/install/core/tpl/step4.tpl b/install/core/tpl/step4.tpl
index 11716cccd3..7959cbdbb4 100644
--- a/install/core/tpl/step4.tpl
+++ b/install/core/tpl/step4.tpl
@@ -1,6 +1,5 @@
 <div class="panel-body body">
     <div id="msg-box" class="alert hide"></div>
-    <div class="loading-icon hide"></div>
     <form id="nav">
         <div class="row">
             <div class="col-md-8" style="width:100%" >
@@ -136,6 +135,11 @@
         </div>
     </form>
 </div>
+<div class="loading-panel hide">
+    <div class="text-right">
+        <span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
+    </div>
+</div>
 <footer class="modal-footer">
     <button class="btn btn-default" type="button" id="back">{$langs['labels']['Back']}</button>
     <button class="btn btn-primary" type="button" id="next">{$langs['labels']['Next']}</button>
diff --git a/install/core/tpl/step5.tpl b/install/core/tpl/step5.tpl
index 9181c78c60..f4e537247b 100644
--- a/install/core/tpl/step5.tpl
+++ b/install/core/tpl/step5.tpl
@@ -1,6 +1,5 @@
 <div class="panel-body body">
     <div id="msg-box" class="alert hide"></div>
-    <div class="loading-icon hide"></div>
     <form id="nav" autocomplete="off">
         <div class="row">
             <div class="col-md-8" style="width:100%" >
@@ -108,6 +107,11 @@
         </div>
     </form>
 </div>
+<div class="loading-panel hide">
+    <div class="text-right">
+        <span class="glyphicon glyphicon-refresh glyphicon-refresh-animate"></span>
+    </div>
+</div>
 <footer class="modal-footer">
     <button class="btn btn-default" type="button" id="back">{$langs['labels']['Back']}</button>
     <button class="btn btn-primary" type="button" id="next">{$langs['labels']['Next']}</button>
diff --git a/install/css/install.css b/install/css/install.css
index 5b7cca6d8f..6c10977abc 100644
--- a/install/css/install.css
+++ b/install/css/install.css
@@ -26,14 +26,6 @@ select[name="user-lang"] {
 	margin-left: 16.6667%;
 }
 
-.loading-icon {
-    background-image: url("../img/loading-icon.gif");
-    background-repeat: no-repeat;
-    height: 31px;
-    width: 31px;
-	float: right;
-}
-
 .devices {
 	width: 50%;
 	height: 50%;
@@ -68,7 +60,6 @@ select[name="user-lang"] {
 	text-align: center;
 	width: 4%;
 	float: left;
-
 }
 
 .semicolon-sign {
@@ -109,8 +100,13 @@ input[type=checkbox].btn-default {
 	margin-right: 10px;
 }
 
-.setup-confirmation .loading-icon {
-	margin-top: 10px;
+.loading-panel {
+    padding: 0 14px 10px 0;
+    margin-top: -29px;
+}
+
+.space {
+    padding: 14px;
 }
 
 span.remark {
@@ -152,4 +148,26 @@ span.ok {
 .main-header.panel-heading {
     background-color: #546e7a !important;
     padding: 0px 2px;
+}
+
+.glyphicon-refresh-animate {
+    -animation: front .5s infinite linear;
+    -ms-animation: front .5s infinite linear;
+    -webkit-animation: right .5s infinite linear;
+    -moz-animation: left .5s infinite linear;
+}
+
+@keyframes front {
+    from { transform: scale(1) rotate(0deg);}
+    to { transform: scale(1) rotate(360deg);}
+}
+
+@-webkit-keyframes right {
+    from { -webkit-transform: rotate(0deg);}
+    to { -webkit-transform: rotate(360deg);}
+}
+
+@-moz-keyframes left {
+    from { -moz-transform: rotate(0deg);}
+    to { -moz-transform: rotate(360deg);}
 }
\ No newline at end of file
diff --git a/install/img/loading-icon.gif b/install/img/loading-icon.gif
deleted file mode 100644
index 7c12c21fcb..0000000000
Binary files a/install/img/loading-icon.gif and /dev/null differ
diff --git a/install/js/install.js b/install/js/install.js
index 769b2eba69..e75f46dca8 100644
--- a/install/js/install.js
+++ b/install/js/install.js
@@ -566,11 +566,11 @@ InstallScript.prototype.hideMsg = function() {
 }
 
 InstallScript.prototype.showLoading = function() {
-	$('.loading-icon').removeClass('hide');
+	$('.loading-panel').removeClass('hide');
 }
 
 InstallScript.prototype.hideLoading = function() {
-	$('.loading-icon').addClass('hide');
+	$('.loading-panel').addClass('hide');
 }
 
 InstallScript.prototype.checkPass = function(opt) {