diff --git a/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java b/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java
index dc96a172..bc8c0164 100644
--- a/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java
+++ b/Clover/app/src/main/java/org/floens/chan/ui/activity/ChanActivity.java
@@ -239,6 +239,12 @@ public class ChanActivity extends BaseActivity implements AdapterView.OnItemSele
         updateActionBarState();
     }
 
+    @Override
+    public void removePin(Pin pin) {
+        super.removePin(pin);
+        updateActionBarState();
+    }
+
     @Override
     public void onNothingSelected(final AdapterView<?> parent) {
     }
@@ -422,6 +428,16 @@ public class ChanActivity extends BaseActivity implements AdapterView.OnItemSele
         setMenuItemEnabled(menu.findItem(R.id.action_search), slidable);
         setMenuItemEnabled(menu.findItem(R.id.action_search_tablet), !slidable);
 
+        boolean bookmarkedFilled = false;
+        if (threadLoadable.mode == Loadable.Mode.THREAD) {
+            Pin pin = ChanApplication.getWatchManager().findPinByLoadable(threadLoadable);
+            if (pin != null) {
+                bookmarkedFilled = true;
+            }
+        }
+
+        menu.findItem(R.id.action_pin).setIcon(bookmarkedFilled ? R.drawable.ic_bookmark_filled : R.drawable.ic_bookmark);
+
         return super.onPrepareOptionsMenu(menu);
     }
 
@@ -468,6 +484,7 @@ public class ChanActivity extends BaseActivity implements AdapterView.OnItemSele
                     if (loader != null && loader.getLoadable().isThreadMode() && loader.getThread() != null) {
                         ChanApplication.getWatchManager().addPin(loader.getLoadable(), loader.getThread().op);
                         pinDrawer.openDrawer(pinDrawerView);
+                        updateActionBarState();
                     }
                 }
 
diff --git a/Clover/app/src/main/res/drawable-hdpi/ic_bookmark_filled.png b/Clover/app/src/main/res/drawable-hdpi/ic_bookmark_filled.png
new file mode 100644
index 00000000..66d4223d
Binary files /dev/null and b/Clover/app/src/main/res/drawable-hdpi/ic_bookmark_filled.png differ
diff --git a/Clover/app/src/main/res/drawable-mdpi/ic_bookmark_filled.png b/Clover/app/src/main/res/drawable-mdpi/ic_bookmark_filled.png
new file mode 100644
index 00000000..7b4e65d7
Binary files /dev/null and b/Clover/app/src/main/res/drawable-mdpi/ic_bookmark_filled.png differ
diff --git a/Clover/app/src/main/res/drawable-xhdpi/ic_bookmark_filled.png b/Clover/app/src/main/res/drawable-xhdpi/ic_bookmark_filled.png
new file mode 100644
index 00000000..c5698328
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xhdpi/ic_bookmark_filled.png differ
diff --git a/Clover/app/src/main/res/drawable-xxhdpi/ic_bookmark_filled.png b/Clover/app/src/main/res/drawable-xxhdpi/ic_bookmark_filled.png
new file mode 100644
index 00000000..abda33a9
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxhdpi/ic_bookmark_filled.png differ
diff --git a/Clover/app/src/main/res/drawable-xxxhdpi/ic_bookmark_filled.png b/Clover/app/src/main/res/drawable-xxxhdpi/ic_bookmark_filled.png
new file mode 100644
index 00000000..325c7b2f
Binary files /dev/null and b/Clover/app/src/main/res/drawable-xxxhdpi/ic_bookmark_filled.png differ