diff --git a/models/Message.php b/models/Message.php
index 93b71b99..b9664b51 100644
--- a/models/Message.php
+++ b/models/Message.php
@@ -419,6 +419,12 @@ public function isPinned($userId = null): bool
 
     public function getPinIcon($userId = null): ?Icon
     {
-        return $this->isPinned($userId) ? Icon::get('thumb-tack') : null;
+        if ($this->isPinned($userId)) {
+            return Icon::get('map-pin')
+                ->tooltip(Yii::t('MailModule.base', 'Pinned'))
+                ->color(Yii::$app->view->theme->variable('danger', 'red'));
+        }
+
+        return null;
     }
 }
diff --git a/widgets/PinLink.php b/widgets/PinLink.php
index 8cb8a4a9..eeae056f 100644
--- a/widgets/PinLink.php
+++ b/widgets/PinLink.php
@@ -25,11 +25,11 @@ public function run()
         if ($this->message->isPinned()) {
             return Link::none(Yii::t('MailModule.base', 'Unpin'))
                 ->action('mail.conversation.linkAction', Url::toUnpinConversation($this->message))
-                ->icon('thumb-tack');
+                ->icon('map-pin');
         }
 
         return Link::none(Yii::t('MailModule.base', 'Pin'))
             ->action('mail.conversation.linkAction', Url::toPinConversation($this->message))
-            ->icon('thumb-tack');
+            ->icon('map-pin');
     }
 }