diff --git a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
index c4a132c98..08bcb6336 100644
--- a/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
+++ b/app/src/main/java/org/thoughtcrime/securesms/conversation/ConversationItem.java
@@ -462,6 +462,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
       bodyText.setLinkTextColor(colorizer.getOutgoingBodyTextColor(context));
       footer.setTextColor(colorizer.getOutgoingFooterTextColor(context));
       footer.setIconColor(colorizer.getOutgoingFooterIconColor(context));
+      footer.setRevealDotColor(colorizer.getOutgoingFooterIconColor(context));
       footer.setOnlyShowSendingStatus(false, messageRecord);
     } else if (messageRecord.isRemoteDelete() || (isViewOnceMessage(messageRecord) && ViewOnceUtil.isViewed((MmsMessageRecord) messageRecord))) {
       if (hasWallpaper) {
@@ -469,6 +470,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
       } else {
         bodyBubble.getBackground().setColorFilter(ContextCompat.getColor(context, R.color.signal_background_primary), PorterDuff.Mode.MULTIPLY);
         footer.setIconColor(ContextCompat.getColor(context, R.color.signal_icon_tint_secondary));
+        footer.setRevealDotColor(ContextCompat.getColor(context, R.color.signal_icon_tint_secondary));
       }
       footer.setTextColor(ContextCompat.getColor(context, R.color.signal_text_secondary));
       footer.setOnlyShowSendingStatus(messageRecord.isRemoteDelete(), messageRecord);
@@ -476,6 +478,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
       bodyBubble.getBackground().setColorFilter(getDefaultBubbleColor(hasWallpaper), PorterDuff.Mode.SRC_IN);
       footer.setTextColor(ContextCompat.getColor(context, R.color.signal_text_secondary));
       footer.setIconColor(ContextCompat.getColor(context, R.color.signal_text_secondary));
+      footer.setRevealDotColor(ContextCompat.getColor(context, R.color.signal_text_secondary));
       footer.setOnlyShowSendingStatus(false, messageRecord);
     }
 
@@ -920,7 +923,13 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
           thumbnailSlides.get(0) instanceof VideoSlide)
       {
         canPlayContent = GiphyMp4PlaybackPolicy.autoplay() || allowedToPlayInline;
-        mediaSource    = attachmentMediaSourceFactory.createMediaSource(Objects.requireNonNull(thumbnailSlides.get(0).getUri()));
+
+        Uri uri = thumbnailSlides.get(0).getUri();
+        if (uri != null) {
+          mediaSource = attachmentMediaSourceFactory.createMediaSource(uri);
+        } else {
+          mediaSource = null;
+        }
       }
 
     } else {
@@ -1209,6 +1218,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
           activeFooter.disableBubbleBackground();
           activeFooter.setTextColor(ContextCompat.getColor(context, R.color.conversation_item_sent_text_secondary_color));
           activeFooter.setIconColor(ContextCompat.getColor(context, R.color.conversation_item_sent_text_secondary_color));
+          activeFooter.setRevealDotColor(ContextCompat.getColor(context, R.color.conversation_item_sent_text_secondary_color));
         } else {
           activeFooter.enableBubbleBackground(R.drawable.wallpaper_bubble_background_tintable_11,  getDefaultBubbleColor(hasWallpaper));
         }
@@ -1216,6 +1226,7 @@ public final class ConversationItem extends RelativeLayout implements BindableCo
         activeFooter.disableBubbleBackground();
         activeFooter.setTextColor(ContextCompat.getColor(context, R.color.signal_text_secondary));
         activeFooter.setIconColor(ContextCompat.getColor(context, R.color.signal_icon_tint_secondary));
+        activeFooter.setRevealDotColor(ContextCompat.getColor(context, R.color.signal_icon_tint_secondary));
       } else {
         activeFooter.disableBubbleBackground();
       }
diff --git a/app/src/main/res/layout/conversation_item_received_multimedia.xml b/app/src/main/res/layout/conversation_item_received_multimedia.xml
index ece13844a..dcf0157c1 100644
--- a/app/src/main/res/layout/conversation_item_received_multimedia.xml
+++ b/app/src/main/res/layout/conversation_item_received_multimedia.xml
@@ -192,7 +192,7 @@
             android:clipToPadding="false"
             android:gravity="start"
             app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"
-            app:footer_reveal_dot_color="@color/core_white"
+            app:footer_reveal_dot_color="@color/conversation_item_sent_text_secondary_color"
             app:footer_text_color="@color/conversation_item_sent_text_secondary_color" />
 
         <org.thoughtcrime.securesms.components.ConversationItemFooter
@@ -210,6 +210,7 @@
             android:gravity="start"
             android:visibility="gone"
             app:footer_icon_color="@color/signal_icon_tint_secondary"
+            app:footer_reveal_dot_color="@color/signal_icon_tint_secondary"
             app:footer_text_color="@color/signal_text_secondary" />
 
     </org.thoughtcrime.securesms.conversation.ConversationItemBodyBubble>
diff --git a/app/src/main/res/layout/conversation_item_received_text_only.xml b/app/src/main/res/layout/conversation_item_received_text_only.xml
index ef503651d..3600faca1 100644
--- a/app/src/main/res/layout/conversation_item_received_text_only.xml
+++ b/app/src/main/res/layout/conversation_item_received_text_only.xml
@@ -123,6 +123,7 @@
             android:clipToPadding="false"
             android:gravity="start"
             app:footer_icon_color="@color/signal_icon_tint_secondary"
+            app:footer_reveal_dot_color="@color/signal_icon_tint_secondary"
             app:footer_text_color="@color/signal_text_secondary" />
 
         <org.thoughtcrime.securesms.components.ConversationItemFooter
@@ -137,6 +138,7 @@
             android:gravity="start"
             android:visibility="gone"
             app:footer_icon_color="@color/signal_icon_tint_secondary"
+            app:footer_reveal_dot_color="@color/signal_icon_tint_secondary"
             app:footer_text_color="@color/signal_text_secondary" />
 
     </org.thoughtcrime.securesms.conversation.ConversationItemBodyBubble>
diff --git a/app/src/main/res/layout/conversation_item_sent_multimedia.xml b/app/src/main/res/layout/conversation_item_sent_multimedia.xml
index dff032e45..03cb8c94e 100644
--- a/app/src/main/res/layout/conversation_item_sent_multimedia.xml
+++ b/app/src/main/res/layout/conversation_item_sent_multimedia.xml
@@ -161,6 +161,7 @@
             android:gravity="end"
             android:visibility="gone"
             app:footer_icon_color="@color/signal_icon_tint_secondary"
+            app:footer_reveal_dot_color="@color/signal_icon_tint_secondary"
             app:footer_text_color="@color/signal_text_secondary" />
 
     </org.thoughtcrime.securesms.conversation.ConversationItemBodyBubble>
diff --git a/app/src/main/res/layout/conversation_item_sent_text_only.xml b/app/src/main/res/layout/conversation_item_sent_text_only.xml
index f31ebeb97..8638abf1c 100644
--- a/app/src/main/res/layout/conversation_item_sent_text_only.xml
+++ b/app/src/main/res/layout/conversation_item_sent_text_only.xml
@@ -74,6 +74,7 @@
             android:clipToPadding="false"
             android:gravity="end"
             app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"
+            app:footer_reveal_dot_color="@color/conversation_item_sent_text_secondary_color"
             app:footer_text_color="@color/conversation_item_sent_text_secondary_color" />
 
         <org.thoughtcrime.securesms.components.ConversationItemFooter
@@ -88,6 +89,7 @@
             android:gravity="end"
             android:visibility="gone"
             app:footer_icon_color="@color/signal_icon_tint_secondary"
+            app:footer_reveal_dot_color="@color/signal_icon_tint_secondary"
             app:footer_text_color="@color/signal_text_secondary" />
 
     </org.thoughtcrime.securesms.conversation.ConversationItemBodyBubble>
diff --git a/app/src/main/res/layout/conversation_item_thumbnail.xml b/app/src/main/res/layout/conversation_item_thumbnail.xml
index 7fdc5231a..3aeebe241 100644
--- a/app/src/main/res/layout/conversation_item_thumbnail.xml
+++ b/app/src/main/res/layout/conversation_item_thumbnail.xml
@@ -44,6 +44,7 @@
         android:layout_marginBottom="@dimen/message_bubble_bottom_padding"
         android:gravity="end"
         app:footer_text_color="@color/signal_text_toolbar_subtitle"
+        app:footer_reveal_dot_color="@color/signal_text_toolbar_subtitle"
         app:footer_icon_color="@color/signal_text_toolbar_subtitle"/>
 
 </merge>
diff --git a/app/src/main/res/layout/longmessage_bubble_received.xml b/app/src/main/res/layout/longmessage_bubble_received.xml
index 147d1a408..fdb96865f 100644
--- a/app/src/main/res/layout/longmessage_bubble_received.xml
+++ b/app/src/main/res/layout/longmessage_bubble_received.xml
@@ -39,6 +39,7 @@
         android:clipToPadding="false"
         android:alpha="0.7"
         app:footer_text_color="@color/signal_text_secondary"
+        app:footer_reveal_dot_color="@color/signal_text_secondary"
         app:footer_icon_color="@color/signal_icon_tint_secondary"/>
 
 </LinearLayout>
\ No newline at end of file
diff --git a/app/src/main/res/layout/longmessage_bubble_sent.xml b/app/src/main/res/layout/longmessage_bubble_sent.xml
index c5d78f31a..4e5264cfd 100644
--- a/app/src/main/res/layout/longmessage_bubble_sent.xml
+++ b/app/src/main/res/layout/longmessage_bubble_sent.xml
@@ -38,6 +38,7 @@
         android:clipChildren="false"
         android:clipToPadding="false"
         app:footer_text_color="@color/conversation_item_sent_text_secondary_color"
+        app:footer_reveal_dot_color="@color/conversation_item_sent_text_secondary_color"
         app:footer_icon_color="@color/conversation_item_sent_text_secondary_color"/>
 
 </LinearLayout>
\ No newline at end of file