diff --git a/dev/Styles/User/Animations.less b/dev/Styles/User/Animations.less
index 9a9679777..911daae48 100644
--- a/dev/Styles/User/Animations.less
+++ b/dev/Styles/User/Animations.less
@@ -10,15 +10,6 @@
 	100% {background-position: 60px 0;}
 }
 
-.e-strip-animation {
-	background-size: 60px 60px;
-	background-image: linear-gradient(135deg, #000 25%, #fff 25%,
-		#fff 50%, #000 50%, #000 75%,
-		#fff 75%, #fff);
-	animation: animate-stripes 2s linear infinite;
-	opacity: 0.25;
-}
-
 @media screen and (min-width: 1000px) {
 
 	.button-delete-transitions {
diff --git a/dev/Styles/User/MessageList.less b/dev/Styles/User/MessageList.less
index ffcc6af98..60da49f0f 100644
--- a/dev/Styles/User/MessageList.less
+++ b/dev/Styles/User/MessageList.less
@@ -111,15 +111,6 @@ html.rl-no-preview-pane {
 		}
 	}
 
-	.line-loading {
-		position: absolute;
-		left: 0;
-		right: 0;
-		z-index: 102;
-		height: 0;
-		top: 50px;
-	}
-
 	.b-content {
 		position: absolute;
 		top: 50px;
@@ -405,10 +396,6 @@ html.rl-ctrl-key-pressed .messageListItem {
 	}
 }
 
-html .messageList .line-loading {
-	height: 5px !important;
-}
-
 #messagesDragImage {
 	color: #fff;
 	background-color: #000;
diff --git a/dev/Styles/User/MessageView.less b/dev/Styles/User/MessageView.less
index 18460603c..64c297459 100644
--- a/dev/Styles/User/MessageView.less
+++ b/dev/Styles/User/MessageView.less
@@ -215,10 +215,6 @@
 			padding-top: 50px;
 		}
 
-		.line-loading {
-			height: 5px;
-		}
-
 		.showImages, .readReceipt, .pgpSigned, .pgpEncrypted {
 			cursor: pointer;
 			padding: 10px 15px;
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
index e54cd64db..c8dd4342d 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/MailMessageView.html
@@ -250,11 +250,9 @@
 								<span class="buttonFull" data-bind="click: toggleFullScreen">
 									<i data-bind="css: { 'icon-arrows-out': !fullScreenMode(), 'icon-arrows-in': fullScreenMode }"></i>
 								</span>
-
-								<div class="line-loading e-strip-animation" data-bind="visible: messageLoadingThrottle()"></div>
-
 								<div class="loading g-ui-min-height-300" data-bind="visible: messageLoadingThrottle()">
-									<span class="text" data-i18n="GLOBAL/LOADING"></span><span class="textLoadingAnimationD1">.</span><span class="textLoadingAnimationD2">.</span><span class="textLoadingAnimationD3">.</span>
+									<i class="icon-spinner"></i>
+									<span data-i18n="GLOBAL/LOADING"></span>
 								</div>
 							</div>
 
diff --git a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
index ea8fc4537..1ce464266 100644
--- a/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
+++ b/snappymail/v/0.0.0/app/templates/Views/User/PopupsContacts.html
@@ -58,10 +58,8 @@
 				<div class="listEmptyList" data-bind="visible: 0 === contacts().length && '' === search() && !contacts.loading()"
 					data-i18n="CONTACTS/EMPTY_LIST"></div>
 				<div class="listEmptyListLoading" data-bind="visible: 0 === contacts().length && '' === search() && contacts.loading()">
+					<i class="icon-spinner"></i>
 					<span data-i18n="GLOBAL/LOADING"></span>
-					<span class="textLoadingAnimationD1">.</span>
-					<span class="textLoadingAnimationD2">.</span>
-					<span class="textLoadingAnimationD3">.</span>
 				</div>
 				<div class="listEmptySearchList" data-bind="visible: 0 === contacts().length && '' !== search() && !contacts.loading()"
 					data-i18n="CONTACTS/EMPTY_SEARCH"></div>