diff --git a/lib/components/message_content.dart b/lib/components/message_content.dart
index 5553cb47..cc2acf1d 100644
--- a/lib/components/message_content.dart
+++ b/lib/components/message_content.dart
@@ -144,11 +144,16 @@ class MessageContent extends StatelessWidget {
           default:
             if (event.content['msgtype'] == Matrix.callNamespace) {
               return RaisedButton(
-                color: Theme.of(context).backgroundColor,
+                elevation: 7,
+                color: Theme.of(context).scaffoldBackgroundColor,
+                shape: RoundedRectangleBorder(
+                  borderRadius: BorderRadius.circular(6),
+                ),
                 child: Row(
                   mainAxisSize: MainAxisSize.min,
                   children: <Widget>[
                     Icon(Icons.phone),
+                    SizedBox(width: 8),
                     Text(L10n.of(context).videoCall),
                   ],
                 ),
diff --git a/lib/components/message_download_content.dart b/lib/components/message_download_content.dart
index 870e0c19..df891552 100644
--- a/lib/components/message_download_content.dart
+++ b/lib/components/message_download_content.dart
@@ -20,17 +20,23 @@ class MessageDownloadContent extends StatelessWidget {
         mainAxisSize: MainAxisSize.min,
         children: <Widget>[
           RaisedButton(
-            color: textColor,
-            elevation: 10,
+            elevation: 7,
+            color: Theme.of(context).scaffoldBackgroundColor,
             shape: RoundedRectangleBorder(
-              borderRadius: BorderRadius.circular(8.0),
+              borderRadius: BorderRadius.circular(6),
             ),
-            child: Text(
-              filename,
-              overflow: TextOverflow.fade,
-              softWrap: false,
-              maxLines: 1,
-              style: TextStyle(color: Theme.of(context).primaryColor),
+            child: Row(
+              mainAxisSize: MainAxisSize.min,
+              children: [
+                Icon(Icons.download_outlined),
+                SizedBox(width: 8),
+                Text(
+                  filename,
+                  overflow: TextOverflow.fade,
+                  softWrap: false,
+                  maxLines: 1,
+                ),
+              ],
             ),
             onPressed: () => event.openFile(context),
           ),