diff --git a/plugins/avatars/index.php b/plugins/avatars/index.php
index e41d11596..fb3145bf9 100644
--- a/plugins/avatars/index.php
+++ b/plugins/avatars/index.php
@@ -153,6 +153,7 @@ class AvatarsPlugin extends \RainLoop\Plugins\AbstractPlugin
 			$aServices = [
 				"services/{$sDomain}",
 				'services/' . \preg_replace('/^.+\\.([^.]+\\.[^.]+)$/D', '$1', $sDomain),
+				'services/' . \preg_replace('/^(.+\\.)?(paypal\\.[a-z][a-z])$/D', 'paypal.com', $sDomain),
 				'empty-contact' // DATA_IMAGE_USER_DOT_PIC
 			];
 			foreach ($aServices as $service) {
diff --git a/plugins/avatars/style.css b/plugins/avatars/style.css
index c9fadcd86..e2e21bac4 100644
--- a/plugins/avatars/style.css
+++ b/plugins/avatars/style.css
@@ -1,11 +1,11 @@
-.messageView .b-content .messageItemHeader .fromPic {
-	display: inline-block;
+.messageView .fromPic {
+	border: 1px solid var(--border-color, #ddd);
 	float: left;
 	width: 50px;
 	height: 50px;
-	margin: 0 5px 0 0;
-	border: 1px solid var(--border-color, #ddd);
-	border-radius: 6px;
+	margin: 0 4px 0 0;
+	padding: 1px;
+	border-radius: var(--border-radius, 5px);
 }
 /*
 .checkboxMessage {
@@ -19,6 +19,7 @@
 	white-space:nowrap;
 }
 .messageCheckbox .fromPic {
-	margin: -0.6em 0 -0.6em 0.4em;
-	height: 2em;
+	margin: 0 0 -0.4em 0.4em;
+	height: 1.5em;
+	max-width: 1.5em;
 }