diff --git a/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/Contents.json b/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/Contents.json
index b3800274c..18810f03f 100644
--- a/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/Contents.json
+++ b/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/Contents.json
@@ -1,23 +1,26 @@
 {
   "images" : [
     {
-      "idiom" : "universal",
       "filename" : "typing.png",
+      "idiom" : "universal",
       "scale" : "1x"
     },
     {
-      "idiom" : "universal",
       "filename" : "typing@2x.png",
+      "idiom" : "universal",
       "scale" : "2x"
     },
     {
-      "idiom" : "universal",
       "filename" : "typing@3x.png",
+      "idiom" : "universal",
       "scale" : "3x"
     }
   ],
   "info" : {
-    "version" : 1,
-    "author" : "xcode"
+    "author" : "xcode",
+    "version" : 1
+  },
+  "properties" : {
+    "template-rendering-intent" : "template"
   }
-}
\ No newline at end of file
+}
diff --git a/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing.png b/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing.png
index 8b57471d5..b331520c1 100644
Binary files a/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing.png and b/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing@2x.png b/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing@2x.png
index 5766b6eba..8460383bd 100644
Binary files a/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing@2x.png and b/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing@2x.png differ
diff --git a/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing@3x.png b/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing@3x.png
index 0e75d5408..1bec72b58 100644
Binary files a/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing@3x.png and b/Riot/Assets/Images.xcassets/Room/Activities/typing.imageset/typing@3x.png differ
diff --git a/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m b/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m
index ba4060d91..b29435bb4 100644
--- a/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m
+++ b/Riot/Modules/Room/Views/Activities/RoomActivitiesView.m
@@ -206,6 +206,7 @@
     if (labelText.length)
     {
         self.iconImageView.image = [UIImage imageNamed:@"typing"];
+        self.iconImageView.tintColor = ThemeService.shared.theme.tintColor;
         self.messageLabel.text = labelText;
         
         self.iconImageView.hidden = NO;