diff --git a/ts/components/conversation/ExpireTimer.tsx b/ts/components/conversation/ExpireTimer.tsx
index aba2d5fc9..351a26ae6 100644
--- a/ts/components/conversation/ExpireTimer.tsx
+++ b/ts/components/conversation/ExpireTimer.tsx
@@ -1,6 +1,6 @@
 import React, { useState } from 'react';
 
-import { getIncrement, getTimerBucketIcon } from '../../util/timer';
+import { getTimerBucketIcon } from '../../util/timer';
 import { useInterval } from '../../hooks/useInterval';
 import styled, { DefaultTheme } from 'styled-components';
 import { OpacityMetadataComponent } from './message/MessageMetadata';
@@ -23,6 +23,7 @@ const ExpireTimerCount = styled(props => (
   letter-spacing: 0.3px;
   text-transform: uppercase;
   user-select: none;
+  color: ${props => props.color};
 `;
 
 const ExpireTimerBucket = styled(props => (
@@ -34,6 +35,7 @@ const ExpireTimerBucket = styled(props => (
   letter-spacing: 0.3px;
   text-transform: uppercase;
   user-select: none;
+  color: ${props => props.color};
 `;
 
 export const ExpireTimer = (props: Props) => {
@@ -65,9 +67,7 @@ export const ExpireTimer = (props: Props) => {
 
   if (timeLeft <= 60) {
     return (
-      <ExpireTimerCount expireTimerColor={expireTimerColor}>
-        {timeLeft}
-      </ExpireTimerCount>
+      <ExpireTimerCount color={expireTimerColor}>{timeLeft}</ExpireTimerCount>
     );
   }
   const bucket = getTimerBucketIcon(expirationTimestamp, expirationLength);
diff --git a/ts/components/session/conversation/SessionMessagesList.tsx b/ts/components/session/conversation/SessionMessagesList.tsx
index 8a0a4fc86..6e2616dcf 100644
--- a/ts/components/session/conversation/SessionMessagesList.tsx
+++ b/ts/components/session/conversation/SessionMessagesList.tsx
@@ -94,6 +94,7 @@ export class SessionMessagesList extends React.Component<Props, State> {
       this.setState(
         {
           showScrollButton: false,
+          animateQuotedMessageId: undefined,
         },
         this.scrollToUnread
       );
diff --git a/ts/components/session/icon/SessionIconButton.tsx b/ts/components/session/icon/SessionIconButton.tsx
index f21b2e566..454adc2b6 100644
--- a/ts/components/session/icon/SessionIconButton.tsx
+++ b/ts/components/session/icon/SessionIconButton.tsx
@@ -45,7 +45,9 @@ export const SessionIconButton = (props: SProps) => {
         iconRotation={iconRotation}
         theme={theme}
       />
-      <SessionNotificationCount count={notificationCount} />
+      {Boolean(notificationCount) && (
+        <SessionNotificationCount count={notificationCount} />
+      )}
     </div>
   );
 };