diff --git a/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java b/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
index d516b8a16..5a1ba1d13 100644
--- a/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
+++ b/src/main/java/org/thoughtcrime/securesms/components/ConversationItemFooter.java
@@ -20,7 +20,7 @@ import org.thoughtcrime.securesms.util.DateUtils;
 public class ConversationItemFooter extends LinearLayout {
 
   private TextView            dateView;
-  private ImageView           staredIndicatorView;
+  private ImageView           bookmarkIndicatorView;
   private ImageView           secureIndicatorView;
   private ImageView           locationIndicatorView;
   private DeliveryStatusView  deliveryStatusView;
@@ -45,7 +45,7 @@ public class ConversationItemFooter extends LinearLayout {
     inflate(getContext(), R.layout.conversation_item_footer, this);
 
     dateView              = findViewById(R.id.footer_date);
-    staredIndicatorView   = findViewById(R.id.footer_stared_indicator);
+    bookmarkIndicatorView = findViewById(R.id.footer_bookmark_indicator);
     secureIndicatorView   = findViewById(R.id.footer_secure_indicator);
     locationIndicatorView = findViewById(R.id.footer_location_indicator);
     deliveryStatusView    = new DeliveryStatusView(findViewById(R.id.delivery_indicator));
@@ -60,8 +60,8 @@ public class ConversationItemFooter extends LinearLayout {
 
   public void setMessageRecord(@NonNull DcMsg messageRecord) {
     presentDate(messageRecord);
-    boolean stared = messageRecord.getOriginalMsgId() != 0 || messageRecord.getSavedMsgId() != 0;
-    staredIndicatorView.setVisibility(stared ? View.VISIBLE : View.GONE);
+    boolean bookmark = messageRecord.getOriginalMsgId() != 0 || messageRecord.getSavedMsgId() != 0;
+    bookmarkIndicatorView.setVisibility(bookmark ? View.VISIBLE : View.GONE);
     secureIndicatorView.setVisibility(messageRecord.isSecure() ? View.VISIBLE : View.GONE);
     locationIndicatorView.setVisibility(messageRecord.hasLocation() ? View.VISIBLE : View.GONE);
     presentDeliveryStatus(messageRecord);
@@ -69,7 +69,7 @@ public class ConversationItemFooter extends LinearLayout {
 
   private void setTextColor(int color) {
     dateView.setTextColor(color);
-    staredIndicatorView.setColorFilter(color);
+    bookmarkIndicatorView.setColorFilter(color);
     secureIndicatorView.setColorFilter(color);
     locationIndicatorView.setColorFilter(color);
     deliveryStatusView.setTint(color);
diff --git a/src/main/res/layout/conversation_item_footer.xml b/src/main/res/layout/conversation_item_footer.xml
index f4ac7a255..8840827b7 100644
--- a/src/main/res/layout/conversation_item_footer.xml
+++ b/src/main/res/layout/conversation_item_footer.xml
@@ -9,7 +9,7 @@
     tools:parentTag="org.thoughtcrime.securesms.components.ConversationItemFooter">
 
     <ImageView
-        android:id="@+id/footer_stared_indicator"
+        android:id="@+id/footer_bookmark_indicator"
         android:layout_width="12sp"
         android:layout_height="11sp"
         android:src="@drawable/baseline_bookmark_24"