diff --git a/app/src/main/res/drawable/bubble_circle_unread.xml b/app/src/main/res/drawable/bubble_circle_unread.xml
index c4cb9d5ec..c33626dd2 100644
--- a/app/src/main/res/drawable/bubble_circle_unread.xml
+++ b/app/src/main/res/drawable/bubble_circle_unread.xml
@@ -22,9 +22,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="oval">
     <solid android:color="#757575" />
-    <stroke
-        android:width="2dp"
-        android:color="@color/white" />
     <size
         android:width="32dp"
         android:height="32dp" />
diff --git a/app/src/main/res/drawable/bubble_circle_unread_mention.xml b/app/src/main/res/drawable/bubble_circle_unread_mention.xml
index 99e07c625..38e601ac0 100644
--- a/app/src/main/res/drawable/bubble_circle_unread_mention.xml
+++ b/app/src/main/res/drawable/bubble_circle_unread_mention.xml
@@ -22,9 +22,6 @@
 <shape xmlns:android="http://schemas.android.com/apk/res/android"
        android:shape="oval">
     <solid android:color="@color/colorPrimary" />
-    <stroke
-        android:width="2dp"
-        android:color="@color/white" />
     <size
         android:width="32dp"
         android:height="32dp" />
diff --git a/app/src/main/res/drawable/ic_file_icon.xml b/app/src/main/res/drawable/ic_file_icon.xml
index 2bf7237fe..c3d00688e 100644
--- a/app/src/main/res/drawable/ic_file_icon.xml
+++ b/app/src/main/res/drawable/ic_file_icon.xml
@@ -21,7 +21,7 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#D5D5D5" android:fillType="nonZero"
+    <path android:fillColor="@color/bg_message_list_incoming_bubble" android:fillType="nonZero"
         android:pathData="M0,0l24,0l0,24l-24,0z" android:strokeAlpha="0"
         android:strokeColor="#000000" android:strokeWidth="1"/>
     <path android:fillColor="#FFFFFF" android:fillType="nonZero"
diff --git a/app/src/main/res/drawable/ic_file_password_request.xml b/app/src/main/res/drawable/ic_file_password_request.xml
index cb47b69f6..f809f74f6 100644
--- a/app/src/main/res/drawable/ic_file_password_request.xml
+++ b/app/src/main/res/drawable/ic_file_password_request.xml
@@ -21,7 +21,7 @@
 <vector android:autoMirrored="true" android:height="24dp"
     android:viewportHeight="24" android:viewportWidth="24"
     android:width="24dp" xmlns:android="http://schemas.android.com/apk/res/android">
-    <path android:fillColor="#D5D5D5" android:fillType="nonZero"
+    <path android:fillColor="@color/bg_message_list_incoming_bubble" android:fillType="nonZero"
         android:pathData="M0,0l24,0l0,24l-24,0z" android:strokeAlpha="0"
         android:strokeColor="#000000" android:strokeWidth="1"/>
     <path android:fillColor="#FFFFFF" android:fillType="nonZero"
diff --git a/build.gradle b/build.gradle
index 2f762d5df..e11fc6a64 100644
--- a/build.gradle
+++ b/build.gradle
@@ -33,7 +33,7 @@ buildscript {
         }
     }
     dependencies {
-        classpath 'com.android.tools.build:gradle:3.5.0'
+        classpath 'com.android.tools.build:gradle:3.5.1'
         classpath "org.jetbrains.kotlin:kotlin-gradle-plugin:${kotlinVersion}"
 
         // NOTE: Do not place your application dependencies here; they belong