diff --git a/assets/javascripts/discourse/components/modal/activity-pub-post-info.js b/assets/javascripts/discourse/components/modal/activity-pub-post-info.js
index 1394578e..368652f6 100644
--- a/assets/javascripts/discourse/components/modal/activity-pub-post-info.js
+++ b/assets/javascripts/discourse/components/modal/activity-pub-post-info.js
@@ -38,7 +38,7 @@ export default class ActivityPubPostInfo extends Component {
 
   get stateIcon() {
     if (this.args.model.state === "not_published") {
-      return "far-dot-circle";
+      return "far-circle-dot";
     } else {
       return this.args.model.post.activity_pub_local
         ? "arrow-up"
@@ -57,7 +57,7 @@ export default class ActivityPubPostInfo extends Component {
 
   get visibilityIcon() {
     return this.args.model.post.activity_pub_visibility === "public"
-      ? "globe-americas"
+      ? "earth-americas"
       : "lock";
   }
 
diff --git a/assets/javascripts/discourse/initializers/activity-pub-initializer.js b/assets/javascripts/discourse/initializers/activity-pub-initializer.js
index a6d231b3..4e778f55 100644
--- a/assets/javascripts/discourse/initializers/activity-pub-initializer.js
+++ b/assets/javascripts/discourse/initializers/activity-pub-initializer.js
@@ -13,44 +13,19 @@ export default {
     withPluginApi("1.6.0", (api) => {
       const currentUser = api.getCurrentUser();
 
-      api.includePostAttributes("activity_pub_enabled", "activity_pub_enabled");
-      api.includePostAttributes(
+      api.addTrackedPostProperties(
+        "activity_pub_enabled",
         "activity_pub_scheduled_at",
-        "activity_pub_scheduled_at"
-      );
-      api.includePostAttributes(
         "activity_pub_published_at",
-        "activity_pub_published_at"
-      );
-      api.includePostAttributes(
         "activity_pub_deleted_at",
-        "activity_pub_deleted_at"
-      );
-      api.includePostAttributes(
         "activity_pub_updated_at",
-        "activity_pub_updated_at"
-      );
-      api.includePostAttributes(
         "activity_pub_visibility",
-        "activity_pub_visibility"
-      );
-      api.includePostAttributes("activity_pub_local", "activity_pub_local");
-      api.includePostAttributes("activity_pub_url", "activity_pub_url");
-      api.includePostAttributes(
+        "activity_pub_local",
+        "activity_pub_url",
         "activity_pub_object_type",
-        "activity_pub_object_type"
-      );
-      api.includePostAttributes("activity_pub_domain", "activity_pub_domain");
-      api.includePostAttributes(
+        "activity_pub_domain",
         "activity_pub_first_post",
-        "activity_pub_first_post"
-      );
-      api.includePostAttributes(
         "activity_pub_is_first_post",
-        "activity_pub_is_first_post"
-      );
-      api.includePostAttributes(
-        "activity_pub_object_id",
         "activity_pub_object_id"
       );
       api.serializeOnCreate("activity_pub_visibility");