diff --git a/CHANGELOG.md b/CHANGELOG.md
index 4ee7b1e2..e76b5805 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -11,6 +11,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Changed
 - Optimized loading messages in conversations
 - Updated conversation item design to be more compact ([#376])
+- Pin/unpin actions now always show as action buttons in menu ([#561])
 
 ### Fixed
 - Fixed position reset when opening attachments in conversations ([#82])
@@ -182,6 +183,7 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 [#376]: https://github.com/FossifyOrg/Messages/issues/376
 [#456]: https://github.com/FossifyOrg/Messages/issues/456
 [#461]: https://github.com/FossifyOrg/Messages/issues/461
+[#561]: https://github.com/FossifyOrg/Messages/pull/561
 
 [Unreleased]: https://github.com/FossifyOrg/Messages/compare/1.4.0...HEAD
 [1.4.0]: https://github.com/FossifyOrg/Messages/compare/1.3.0...1.4.0
diff --git a/app/src/main/kotlin/org/fossify/messages/adapters/ConversationsAdapter.kt b/app/src/main/kotlin/org/fossify/messages/adapters/ConversationsAdapter.kt
index d4b0b620..25749023 100644
--- a/app/src/main/kotlin/org/fossify/messages/adapters/ConversationsAdapter.kt
+++ b/app/src/main/kotlin/org/fossify/messages/adapters/ConversationsAdapter.kt
@@ -312,7 +312,7 @@ class ConversationsAdapter(
         menu.findItem(R.id.cab_pin_conversation).isVisible =
             selectedConversations.any { !pinnedConversations.contains(it.threadId.toString()) }
         menu.findItem(R.id.cab_unpin_conversation).isVisible =
-            selectedConversations.any { pinnedConversations.contains(it.threadId.toString()) }
+            selectedConversations.all { pinnedConversations.contains(it.threadId.toString()) }
     }
 
     private fun refreshConversationsAndFinishActMode() {
diff --git a/app/src/main/res/drawable/ic_archive_vector.xml b/app/src/main/res/drawable/ic_archive_vector.xml
index 0617d995..a05d34dd 100644
--- a/app/src/main/res/drawable/ic_archive_vector.xml
+++ b/app/src/main/res/drawable/ic_archive_vector.xml
@@ -1,3 +1,3 @@
 <vector android:height="24dp" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M20.54,5.23l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6c-0.47,0 -0.88,0.21 -1.16,0.55L3.46,5.23C3.17,5.57 3,6.02 3,6.5V19c0,1.1 0.9,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5c0,-0.48 -0.17,-0.93 -0.46,-1.27zM12,17.5L6.5,12H10v-2h4v2h3.5L12,17.5zM5.12,5l0.81,-1h12l0.94,1H5.12z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M20.54 5.23l-1.39-1.68C18.88 3.21 18.47 3 18 3H6C5.53 3 5.12 3.21 4.84 3.55L3.46 5.23C3.17 5.57 3 6.02 3 6.5V19c0 1.1 0.9 2 2 2h14c1.1 0 2-0.9 2-2V6.5c0-0.48-0.17-0.93-0.46-1.27zM12 17.5L6.5 12H10v-2h4v2h3.5L12 17.5zM5.12 5l0.81-1h12l0.94 1H5.12z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_pin_vector.xml b/app/src/main/res/drawable/ic_pin_vector.xml
new file mode 100644
index 00000000..dc3bfcf3
--- /dev/null
+++ b/app/src/main/res/drawable/ic_pin_vector.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:width="24dp" android:height="24dp" android:viewportWidth="960" android:viewportHeight="960">
+    <path android:pathData="M640 200v280l68 68q6 6 9 13.5t3 15.5v23q0 17-11.5 28.5T680 640H520v234q0 17-11.5 28.5T480 914q-17 0-28.5-11.5T440 874V640H280q-17 0-28.5-11.5T240 600v-23q0-8 3-15.5t9-13.5l68-68V200q-17 0-28.5-11.5T280 160q0-17 11.5-28.5T320 120h320q17 0 28.5 11.5T680 160q0 17-11.5 28.5T640 200z" android:fillColor="#FFFFFF"/>
+</vector>
diff --git a/app/src/main/res/drawable/ic_unarchive_vector.xml b/app/src/main/res/drawable/ic_unarchive_vector.xml
index f4a3b76e..b7c74e1b 100644
--- a/app/src/main/res/drawable/ic_unarchive_vector.xml
+++ b/app/src/main/res/drawable/ic_unarchive_vector.xml
@@ -1,3 +1,3 @@
 <vector android:height="24dp" android:viewportHeight="24" android:viewportWidth="24" android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="@android:color/white" android:pathData="M20.55,5.22l-1.39,-1.68C18.88,3.21 18.47,3 18,3H6C5.53,3 5.12,3.21 4.85,3.55L3.46,5.22C3.17,5.57 3,6.01 3,6.5V19c0,1.1 0.89,2 2,2h14c1.1,0 2,-0.9 2,-2V6.5C21,6.01 20.83,5.57 20.55,5.22zM12,9.5l5.5,5.5H14v2h-4v-2H6.5L12,9.5zM5.12,5l0.82,-1h12l0.93,1H5.12z"/>
+    <path android:fillColor="@android:color/white" android:pathData="M20.55 5.22l-1.39-1.68C18.88 3.21 18.47 3 18 3H6C5.53 3 5.12 3.21 4.85 3.55L3.46 5.22C3.17 5.57 3 6.01 3 6.5V19c0 1.1 0.89 2 2 2h14c1.1 0 2-0.9 2-2V6.5c0-0.49-0.17-0.93-0.45-1.28zM12 9.5l5.5 5.5H14v2h-4v-2H6.5L12 9.5zM5.12 5l0.82-1h12l0.93 1H5.12z"/>
 </vector>
diff --git a/app/src/main/res/drawable/ic_unpin_vector.xml b/app/src/main/res/drawable/ic_unpin_vector.xml
new file mode 100644
index 00000000..2ed20e20
--- /dev/null
+++ b/app/src/main/res/drawable/ic_unpin_vector.xml
@@ -0,0 +1,3 @@
+<vector xmlns:android="http://schemas.android.com/apk/res/android" android:autoMirrored="true" android:height="24dp" android:viewportHeight="960" android:viewportWidth="960" android:width="24dp">
+    <path android:fillColor="#FFFFFF" android:pathData="M572 459L290 177q-5-5-7.5-11t-2.5-12q0-13 9-23.5t24-10.5h327q17 0 28.5 11.5T680 160q0 16-14.5 22.5T640 200v230q0 27-24.5 37.5T572 459zM440 880V640H296q-25 0-40-17.5T241 583q0-11 4.5-22t14.5-21l60-60v-46L84 196q-11-11-11.5-27.5T84 140q11-11 28-11t28 11l679 679q12 12 11.5 28.5T818 876q-12 11-28 11.5T762 876L526 640h-6v240q0 17-11.5 28.5T480 920q-17 0-28.5-11.5T440 880z"/>
+</vector>
diff --git a/app/src/main/res/menu/cab_conversations.xml b/app/src/main/res/menu/cab_conversations.xml
index 54c881b8..e752b7eb 100644
--- a/app/src/main/res/menu/cab_conversations.xml
+++ b/app/src/main/res/menu/cab_conversations.xml
@@ -3,6 +3,18 @@
     xmlns:app="http://schemas.android.com/apk/res-auto"
     xmlns:tools="http://schemas.android.com/tools"
     tools:ignore="AppCompatResource,AlwaysShowAction">
+    <item
+        android:id="@+id/cab_pin_conversation"
+        android:icon="@drawable/ic_pin_vector"
+        android:showAsAction="always"
+        android:title="@string/pin_conversation"
+        app:showAsAction="always" />
+    <item
+        android:id="@+id/cab_unpin_conversation"
+        android:icon="@drawable/ic_unpin_vector"
+        android:showAsAction="always"
+        android:title="@string/unpin_conversation"
+        app:showAsAction="always" />
     <item
         android:id="@+id/cab_dial_number"
         android:icon="@drawable/ic_phone_vector"
@@ -62,16 +74,4 @@
         android:showAsAction="never"
         android:title="@string/block_number"
         app:showAsAction="never" />
-    <item
-        android:id="@+id/cab_pin_conversation"
-        android:icon="@drawable/ic_pin_filled_vector"
-        android:showAsAction="never"
-        android:title="@string/pin_conversation"
-        app:showAsAction="never" />
-    <item
-        android:id="@+id/cab_unpin_conversation"
-        android:icon="@drawable/ic_pin_filled_vector"
-        android:showAsAction="never"
-        android:title="@string/unpin_conversation"
-        app:showAsAction="never" />
 </menu>