diff --git a/src/Widgets/Status.vala b/src/Widgets/Status.vala
index ec54b04..f7cfd09 100644
--- a/src/Widgets/Status.vala
+++ b/src/Widgets/Status.vala
@@ -220,6 +220,7 @@ public class Tooth.Widgets.Status : ListBoxRow {
 		    action_on = "favourite",
 		    action_off = "unfavourite",
 		    icon_name = "tooth-unstarred-symbolic",
+			icon_toggled_name = "tooth-starred-symbolic"
 		};
 		favorite_button.add_css_class("ttl-status-action-star");
 		favorite_button.tooltip_text = _("Favourite");
@@ -230,6 +231,7 @@ public class Tooth.Widgets.Status : ListBoxRow {
 		    action_on = "bookmark",
 		    action_off = "unbookmark",
 		    icon_name = "tooth-bookmarks-symbolic",
+			icon_toggled_name = "tooth-bookmarks-filled-symbolic"
 		};
 		bookmark_button.add_css_class("ttl-status-action-bookmark");
 		bookmark_button.tooltip_text = _("Bookmark");
@@ -243,7 +245,7 @@ public class Tooth.Widgets.Status : ListBoxRow {
 		append_actions ();
 
 		// var menu_button = new MenuButton (); //TODO: Status menu
-		// menu_button.icon_name = "view-more-symbolic";
+		// menu_button.icon_name = "tooth-view-more-symbolic";
 		// menu_button.get_first_child ().add_css_class ("flat");
 		// actions.append (menu_button);
 
diff --git a/src/Widgets/StatusActionButton.vala b/src/Widgets/StatusActionButton.vala
index a72b591..99e4a0f 100644
--- a/src/Widgets/StatusActionButton.vala
+++ b/src/Widgets/StatusActionButton.vala
@@ -8,6 +8,8 @@ public class Tooth.StatusActionButton : LockableToggleButton {
 	public string prop_name { get; set; }
 	public string action_on { get; construct set; }
 	public string action_off { get; construct set; }
+	public string icon_toggled_name { get; set; default = null; }
+	public string default_icon_name { get; set; default = null; }
 
 	~StatusActionButton() {
 		if (object != null) {
@@ -19,6 +21,7 @@ public class Tooth.StatusActionButton : LockableToggleButton {
 		this.object = obj;
 		active = get_value ();
 		set_class_enabled(active);
+		set_toggled_icon(active);
 		object.notify[prop_name].connect (on_object_notify);
 	}
 
@@ -30,6 +33,19 @@ public class Tooth.StatusActionButton : LockableToggleButton {
 		}
 	}
 
+	protected void set_toggled_icon(bool is_active = true) {
+		if (icon_toggled_name != null) {
+			if (this.icon_name != null && this.default_icon_name == null) {
+				default_icon_name = this.icon_name;
+			}
+			if (is_active) {
+				this.icon_name = icon_toggled_name;
+			} else {
+				this.icon_name = default_icon_name;
+			}
+		}
+	}
+
 	protected void on_object_notify (ParamSpec pspec) {
 		if (locked)
 			return;
@@ -37,7 +53,6 @@ public class Tooth.StatusActionButton : LockableToggleButton {
 		set_locked(true);
 		var val = get_value ();
 		active = val;
-		set_class_enabled(active);
 		set_locked(false);
 	}
 
@@ -46,7 +61,6 @@ public class Tooth.StatusActionButton : LockableToggleButton {
 		val.set_boolean (state);
 		object.set_property (prop_name, val);
 		active = val.get_boolean ();
-		set_class_enabled(active);
 	}
 
 	protected bool get_value () {
@@ -73,6 +87,8 @@ public class Tooth.StatusActionButton : LockableToggleButton {
 		req = entity.action (action);
 
 		set_locked(true);
+		set_class_enabled(active);
+		set_toggled_icon(active);
 
 		message (@"Performing status action '$action'...");
 		req.await.begin ((o, res) => {
@@ -89,6 +105,8 @@ public class Tooth.StatusActionButton : LockableToggleButton {
 				warning (@"Couldn't perform action \"$action\" on a Status:");
 				warning (e.message);
 				app.inform (Gtk.MessageType.WARNING, _("Network Error"), e.message);
+				set_class_enabled(!active);
+				set_toggled_icon(!active);
 			}
 
 			req = null;