diff --git a/app/src/main/res/drawable-xhdpi/download_default.png b/app/src/main/res/drawable-xhdpi/download_default.png
new file mode 100644
index 000000000..7b0a1095d
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/download_default.png differ
diff --git a/app/src/main/res/drawable-xhdpi/download_disabled.png b/app/src/main/res/drawable-xhdpi/download_disabled.png
new file mode 100644
index 000000000..26835cec4
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/download_disabled.png differ
diff --git a/app/src/main/res/drawable-xhdpi/file.png b/app/src/main/res/drawable-xhdpi/file.png
new file mode 100644
index 000000000..769cdc7ed
Binary files /dev/null and b/app/src/main/res/drawable-xhdpi/file.png differ
diff --git a/app/src/main/res/drawable/download.xml b/app/src/main/res/drawable/download.xml
new file mode 100644
index 000000000..4a957a6d5
--- /dev/null
+++ b/app/src/main/res/drawable/download.xml
@@ -0,0 +1,6 @@
+<?xml version="1.0" encoding="utf-8"?>
+<selector xmlns:android="http://schemas.android.com/apk/res/android">
+    <item android:drawable="@drawable/download_disabled" android:state_enabled="false" />
+    <item android:drawable="@drawable/download_default" />
+</selector>
+
diff --git a/app/src/main/res/layout/chat_message_content_cell.xml b/app/src/main/res/layout/chat_message_content_cell.xml
index 3b42911fe..86f5fcd20 100644
--- a/app/src/main/res/layout/chat_message_content_cell.xml
+++ b/app/src/main/res/layout/chat_message_content_cell.xml
@@ -53,10 +53,15 @@
             android:textSize="12sp"
             android:fontFamily="sans-serif"
             android:textStyle="normal"
+            android:drawableTop="@drawable/file"
+            android:drawableTint="?attr/drawableTintColor2"
+            android:drawablePadding="5dp"
+            android:padding="5dp"
             android:text="@{data.content.name}"
             android:visibility="@{data.downloadable || data.image || data.video ? View.GONE : View.VISIBLE, default=gone}"
             android:layout_width="150dp"
-            android:layout_height="100dp"
+            android:layout_height="match_parent"
+            android:maxHeight="100dp"
             android:layout_margin="5dp"
             android:background="@color/chat_bubble_text_color"
             android:ellipsize="end"
@@ -75,6 +80,8 @@
             android:layout_margin="5dp"
             android:textColor="@drawable/assistant_button_text_color"
             android:background="@drawable/resizable_assistant_button"
+            android:drawableLeft="@drawable/download"
+            android:drawablePadding="10dp"
             android:ellipsize="end"
             android:padding="10dp" />
 
diff --git a/app/src/main/res/values-night/styles.xml b/app/src/main/res/values-night/styles.xml
index ecc6bbbb8..064ea33f0 100644
--- a/app/src/main/res/values-night/styles.xml
+++ b/app/src/main/res/values-night/styles.xml
@@ -34,6 +34,7 @@
         <item name="drawableTintColor">@color/white_color</item>
         <item name="drawableTintDisabledColor">@color/light_grey_color</item>
         <item name="drawableTintOverColor">@color/primary_color</item>
+        <item name="drawableTintColor2">@color/dark_grey_color</item>
 
         <item name="lightToolbarBackgroundColor">@color/dark_grey_color</item>
         <item name="lightToolbarBackgroundDisabledColor">@color/light_grey_color</item>
diff --git a/app/src/main/res/values/attrs.xml b/app/src/main/res/values/attrs.xml
index 5b1850fc6..8345f6c27 100644
--- a/app/src/main/res/values/attrs.xml
+++ b/app/src/main/res/values/attrs.xml
@@ -19,6 +19,7 @@
         <attr name="drawableTintColor" format="color"/>
         <attr name="drawableTintDisabledColor" format="color"/>
         <attr name="drawableTintOverColor" format="color"/>
+        <attr name="drawableTintColor2" format="color"/>
 
         <attr name="lightToolbarBackgroundColor" format="color"/>
         <attr name="lightToolbarBackgroundDisabledColor" format="color"/>
diff --git a/app/src/main/res/values/styles.xml b/app/src/main/res/values/styles.xml
index 4e34660d8..84286c7b3 100644
--- a/app/src/main/res/values/styles.xml
+++ b/app/src/main/res/values/styles.xml
@@ -35,6 +35,7 @@
         <item name="drawableTintColor">@color/dark_grey_color</item>
         <item name="drawableTintDisabledColor">@color/disabled_color</item>
         <item name="drawableTintOverColor">@color/primary_color</item>
+        <item name="drawableTintColor2">@color/white_color</item>
 
         <item name="lightToolbarBackgroundColor">@color/toolbar_color</item>
         <item name="lightToolbarBackgroundDisabledColor">@color/light_grey_color</item>