diff --git a/css/style.css b/css/style.css
index a5567b5..9f603d6 100644
--- a/css/style.css
+++ b/css/style.css
@@ -25,6 +25,8 @@
 	width: 100%;
 	border-top: 1px solid #eee;
 	box-sizing: border-box;
+	display: flex;
+	align-items: center;
 }
 
 #app-mailbox-peers li:hover > a,
@@ -140,26 +142,23 @@
 }
 
 .msg-sent, .msg-recv {
-	border-radius: 12px;
+	border: 1px solid #ccc;
+	border-left-width: 4px;
+	border-radius: 2px;
 	margin: 4px;
 	max-width: 50%;
 	padding: 8px;
-	box-shadow: 1px 1px 1px #CCC;
-	-moz-box-shadow: 1px 1px 1px #CCC;
-	-webkit-box-shadow: 1px 1px 1px #CCC;
-	-ms-box-shadow: 1px 1px 1px #CCC;
-	-o-box-shadow: 1px 1px 1px #CCC;
+	box-shadow: 0px 1px 2px 0px #0000004d;
 }
 
 .msg-sent {
-	border: 1px solid #bbb;
-	background: #a5fb7a;
+	border-color: #a0ce89;
+	background: #e0ffd1;
 	float: right;
 }
 
 .msg-recv {
-	border: 1px solid #bbb;
-	background: #e8e8e8;
+	background: #f5f5f5;
 	float: left;
 }
 
@@ -214,27 +213,7 @@ label {
 	font-weight: bold;
 }
 
-.loader,
-.loader:before,
-.loader:after {
-	background: #646464;
-	-webkit-animation: load1 1s infinite ease-in-out;
-	animation: load1 1s infinite ease-in-out;
-	width: 1em;
-	height: 4em;
-}
-.loader:before,
-.loader:after {
-	position: absolute;
-	top: 0;
-	content: '';
-}
-.loader:before {
-	left: -1.5em;
-	-webkit-animation-delay: -0.32s;
-	animation-delay: -0.32s;
-}
-.loader {
+.icon-loading {
 	color: #646464;
 	text-indent: -9999em;
 	margin: 88px auto;
@@ -246,30 +225,3 @@ label {
 	-webkit-animation-delay: -0.16s;
 	animation-delay: -0.16s;
 }
-.loader:after {
-	left: 1.5em;
-}
-@-webkit-keyframes load1 {
-	0%,
-	80%,
-	100% {
-		box-shadow: 0 0;
-		height: 4em;
-	}
-	40% {
-		box-shadow: 0 -2em;
-		height: 5em;
-	}
-}
-@keyframes load1 {
-	0%,
-	80%,
-	100% {
-		box-shadow: 0 0;
-		height: 4em;
-	}
-	40% {
-		box-shadow: 0 -2em;
-		height: 5em;
-	}
-}
diff --git a/templates/main.php b/templates/main.php
index 05773a0..9fb4950 100644
--- a/templates/main.php
+++ b/templates/main.php
@@ -8,7 +8,7 @@ use \OCA\OcSms\Lib\CountryCodes;
 
 <div class="ng-scope" id="app" ng-app="OcSms" ng-controller="OcSmsController">
 	<div id="app-mailbox-peers">
-		<div id="app-contacts-loader" class="loader" ng-show="isContactsLoading">
+		<div id="app-contacts-loader" class="icon-loading" ng-show="isContactsLoading">
 		</div>
 		<ul class="contact-list" ng-show="!isContactsLoading">
 			<li ng-repeat="contact in contacts | orderBy:setting_contactOrder:setting_contactOrderReverse" peer-label="{{ contact.label }}" ng-click="loadConversation(contact);" href="#">
@@ -58,7 +58,7 @@ use \OCA\OcSms\Lib\CountryCodes;
 	</div>
 
 	<div id="app-content">
-		<div id="app-content-loader" class="loader" ng-show="isConvLoading">
+		<div id="app-content-loader" class="icon-loading" ng-show="isConvLoading">
 		</div>
 		<div id="app-content-header" ng-show="!isConvLoading && selectedContact.label !== undefined && selectedContact.label !== ''"
 			 ng-style="{'background-color': (selectedContact.label | peerColor)}">