diff --git a/InvenTree/InvenTree/views.py b/InvenTree/InvenTree/views.py
index 00f38ce89d..989fb1bc9d 100644
--- a/InvenTree/InvenTree/views.py
+++ b/InvenTree/InvenTree/views.py
@@ -655,17 +655,6 @@ class IndexView(TemplateView):
 
         context = super(TemplateView, self).get_context_data(**kwargs)
 
-        # TODO - Re-implement this when a less expensive method is worked out
-        # context['starred'] = [star.part for star in self.request.user.starred_parts.all()]
-
-        # Generate a list of orderable parts which have stock below their minimum values
-        # TODO - Is there a less expensive way to get these from the database
-        # context['to_order'] = [part for part in Part.objects.filter(purchaseable=True) if part.need_to_restock()]
-
-        # Generate a list of assembly parts which have stock below their minimum values
-        # TODO - Is there a less expensive way to get these from the database
-        # context['to_build'] = [part for part in Part.objects.filter(assembly=True) if part.need_to_restock()]
-
         return context
 
 
diff --git a/InvenTree/common/models.py b/InvenTree/common/models.py
index 1809f437f7..125941be14 100644
--- a/InvenTree/common/models.py
+++ b/InvenTree/common/models.py
@@ -874,8 +874,8 @@ class InvenTreeUserSetting(BaseInvenTreeSetting):
 
     GLOBAL_SETTINGS = {
         'HOMEPAGE_PART_STARRED': {
-            'name': _('Show starred parts'),
-            'description': _('Show starred parts on the homepage'),
+            'name': _('Show subscribed parts'),
+            'description': _('Show subscribed parts on the homepage'),
             'default': True,
             'validator': bool,
         },
diff --git a/InvenTree/part/templates/part/part_base.html b/InvenTree/part/templates/part/part_base.html
index 16b119e02d..3e00b56158 100644
--- a/InvenTree/part/templates/part/part_base.html
+++ b/InvenTree/part/templates/part/part_base.html
@@ -23,8 +23,8 @@
 {% include "admin_button.html" with url=url %}
 {% endif %}
 
-<button type='button' class='btn btn-outline-secondary' id='toggle-starred' title='{% trans "Star this part" %}'>
-    <span id='part-star-icon' class='fas fa-star {% if starred %}icon-yellow{% endif %}'/>
+<button type='button' class='btn btn-outline-secondary' id='toggle-starred' title='{% trans "Subscribe to nofications for this part" %}'>
+    <span id='part-star-icon' class='fas fa-bullhorn {% if starred %}icon-green{% endif %}'/>
 </button>
 
 {% if barcodes %}
diff --git a/InvenTree/templates/InvenTree/index.html b/InvenTree/templates/InvenTree/index.html
index 95b6c15bf9..6847e41095 100644
--- a/InvenTree/templates/InvenTree/index.html
+++ b/InvenTree/templates/InvenTree/index.html
@@ -84,7 +84,7 @@ function addHeaderAction(label, title, icon, options) {
 addHeaderTitle('{% trans "Parts" %}');
 
 {% if setting_part_starred %}
-addHeaderAction('starred-parts', '{% trans "Starred Parts" %}', 'fa-star');
+addHeaderAction('starred-parts', '{% trans "Subscribed Parts" %}', 'fa-bullhorn');
 loadSimplePartTable("#table-starred-parts", "{% url 'api-part-list' %}", {
     params: {
         "starred": true,
diff --git a/InvenTree/templates/InvenTree/settings/user_homepage.html b/InvenTree/templates/InvenTree/settings/user_homepage.html
index 7eed850ad5..455f7f2a8b 100644
--- a/InvenTree/templates/InvenTree/settings/user_homepage.html
+++ b/InvenTree/templates/InvenTree/settings/user_homepage.html
@@ -14,7 +14,7 @@
 <div class='row'>
     <table class='table table-striped table-condensed'>
         <tbody>
-            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_PART_STARRED" icon='fa-star' user_setting=True %}
+            {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_PART_STARRED" icon='fa-bullhorn' user_setting=True %}
             {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_PART_LATEST" icon='fa-history' user_setting=True %}
             {% include "InvenTree/settings/setting.html" with key="PART_RECENT_COUNT" icon="fa-clock" user_setting=True %}
             {% include "InvenTree/settings/setting.html" with key="HOMEPAGE_BOM_VALIDATION" user_setting=True %}
diff --git a/InvenTree/templates/js/translated/part.js b/InvenTree/templates/js/translated/part.js
index ec72d2682c..0ff6bd400c 100644
--- a/InvenTree/templates/js/translated/part.js
+++ b/InvenTree/templates/js/translated/part.js
@@ -398,9 +398,9 @@ function toggleStar(options) {
                     method: 'PATCH',
                     success: function(response) {
                         if (response.starred) {
-                            $(options.button).addClass('icon-yellow');
+                            $(options.button).addClass('icon-green');
                         } else {
-                            $(options.button).removeClass('icon-yellow');
+                            $(options.button).removeClass('icon-green');
                         }
                     }
                 }