diff --git a/Podfile b/Podfile
index fcd293b33..60bb76b2d 100644
--- a/Podfile
+++ b/Podfile
@@ -8,7 +8,7 @@ target "Riot" do
 
 # Different flavours of pods to MatrixKit
 # The tagged version on which this version of Riot has been built
-pod 'MatrixKit', '0.4.11'
+pod 'MatrixKit', '0.5.0'
 
 # The lastest release available on the CocoaPods repository 
 #pod 'MatrixKit'
diff --git a/Podfile.lock b/Podfile.lock
index 06b3e5fd1..52fc909d5 100644
--- a/Podfile.lock
+++ b/Podfile.lock
@@ -32,53 +32,58 @@ PODS:
     - DTFoundation/Core
   - DTFoundation/UIKit (1.7.12):
     - DTFoundation/Core
-  - GBDeviceInfo (4.2.2):
-    - GBDeviceInfo/Core (= 4.2.2)
-  - GBDeviceInfo/Core (4.2.2)
+  - GBDeviceInfo (4.3.0):
+    - GBDeviceInfo/Core (= 4.3.0)
+  - GBDeviceInfo/Core (4.3.0)
   - GoogleAnalytics (3.17.0)
+  - GZIP (1.1.1)
   - HPGrowingTextView (1.1)
-  - libPhoneNumber-iOS (0.8.17)
-  - MatrixKit (0.4.11):
+  - libPhoneNumber-iOS (0.9.10)
+  - MatrixKit (0.5.0):
     - cmark (~> 0.24.1)
     - DTCoreText (~> 1.6.17)
     - HPGrowingTextView (~> 1.1)
-    - libPhoneNumber-iOS (~> 0.8.14)
-    - MatrixSDK (= 0.7.11)
-  - MatrixSDK (0.7.11):
+    - libPhoneNumber-iOS (~> 0.9.10)
+    - MatrixSDK (= 0.8.0)
+  - MatrixSDK (0.8.0):
     - AFNetworking (~> 3.1.0)
+    - GZIP (~> 1.1.1)
   - OLMKit (2.2.2):
     - OLMKit/olmc (= 2.2.2)
     - OLMKit/olmcpp (= 2.2.2)
   - OLMKit/olmc (2.2.2)
   - OLMKit/olmcpp (2.2.2)
-  - Realm (2.1.2):
-    - Realm/Headers (= 2.1.2)
-  - Realm/Headers (2.1.2)
-  - WebRTC (56.10.15101)
+  - Realm (2.8.1):
+    - Realm/Headers (= 2.8.1)
+  - Realm/Headers (2.8.1)
+  - WebRTC (58.17.16937)
 
 DEPENDENCIES:
-  - GBDeviceInfo (~> 4.2.2)
+  - cmark
+  - DTCoreText
+  - GBDeviceInfo (~> 4.3.0)
   - GoogleAnalytics
-  - MatrixKit (= 0.4.11)
+  - MatrixKit (= 0.5.0)
   - OLMKit
-  - Realm (~> 2.1.1)
-  - WebRTC (= 56.10.15101)
+  - Realm (~> 2.8.1)
+  - WebRTC (= 58.17.16937)
 
 SPEC CHECKSUMS:
   AFNetworking: 5e0e199f73d8626b11e79750991f5d173d1f8b67
   cmark: ec0275215b504780287b6fca360224e384368af8
   DTCoreText: 51904f2374af443e0d270d6fdc76035ab6f9ef8a
   DTFoundation: 26a164ef510877387906fb92bff524a792db4bf8
-  GBDeviceInfo: 0a6e2fc04989ce248572bb988f1a764102eb0e5d
+  GBDeviceInfo: caae36532afcc209b51ac62bba547aadab9e88f2
   GoogleAnalytics: f42cc53a87a51fe94334821868d9c8481ff47a7b
+  GZIP: f8beb59597f651e6970a45b816508a9c6d700b77
   HPGrowingTextView: 88a716d97fb853bcb08a4a08e4727da17efc9b19
-  libPhoneNumber-iOS: 9f083847f8cb9b81064cff2ed2c98cbf18d9f9f2
-  MatrixKit: 72a7d62f3484a44ce7e9f9f850e4f2fd64088007
-  MatrixSDK: 7508abee816785312d658dc7569ea63074025c27
+  libPhoneNumber-iOS: f721ae4d5854bce60934f9fb9b0b28e8e68913cb
+  MatrixKit: 3783ee9b8b049a05a5856c66f749319ec1592161
+  MatrixSDK: 6d1bf7ffc4792622da5441b4ddc6d5c02a0675b3
   OLMKit: b9d8c0ffee9ea8c45bc0aaa9afb47f93fba7efbd
-  Realm: efe855f4d977c8ce5a82d3116d9f1ff155a6550c
-  WebRTC: 116e2a81290a8551d67dd2e471b94803a5bba813
+  Realm: 2627602ad6818451f0cb8c2a6e072f7f10a5f360
+  WebRTC: 1e9a85bf75509eec44be6478c64e9de65ac82332
 
-PODFILE CHECKSUM: 9d16cdea9e05545d9a0362c174a348ff9d9450ef
+PODFILE CHECKSUM: 24c0a0406f24e3ba56478f5e9322cda986a7c199
 
-COCOAPODS: 1.2.0
+COCOAPODS: 1.2.1
diff --git a/Riot/Info.plist b/Riot/Info.plist
index b0a9a351d..67d83c41e 100644
--- a/Riot/Info.plist
+++ b/Riot/Info.plist
@@ -17,11 +17,11 @@
 	<key>CFBundlePackageType</key>
 	<string>APPL</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.3.13</string>
+	<string>0.4.0</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>
-	<string>0.3.13</string>
+	<string>0.4.0</string>
 	<key>ITSAppUsesNonExemptEncryption</key>
 	<true/>
 	<key>ITSEncryptionExportComplianceCode</key>
diff --git a/Riot/Model/RoomList/RecentsDataSource.m b/Riot/Model/RoomList/RecentsDataSource.m
index fd92ce662..334946390 100644
--- a/Riot/Model/RoomList/RecentsDataSource.m
+++ b/Riot/Model/RoomList/RecentsDataSource.m
@@ -418,7 +418,6 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
     NSUInteger count = 0;
     NSArray *sectionArray;
     UIView *missedNotifAndUnreadBadgeBgView = nil;
-    UIColor *bgColor = kRiotColorGreen;
     
     if (section == favoritesSection)
     {
@@ -440,11 +439,6 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
     for (id<MXKRecentCellDataStoring> cellData in sectionArray)
     {
         count += cellData.notificationCount;
-        
-        if (cellData.highlightCount)
-        {
-            bgColor = kRiotColorPinkRed;
-        }
     }
     
     if (count)
@@ -468,7 +462,7 @@ NSString *const kRecentsDataSourceTapOnDirectoryServerChange = @"kRecentsDataSou
         
         missedNotifAndUnreadBadgeBgView = [[UIView alloc] initWithFrame:CGRectMake(0, 0, bgViewWidth, 20)];
         [missedNotifAndUnreadBadgeBgView.layer setCornerRadius:10];
-        missedNotifAndUnreadBadgeBgView.backgroundColor = bgColor;
+        missedNotifAndUnreadBadgeBgView.backgroundColor = kRiotColorSilver;
         
         [missedNotifAndUnreadBadgeBgView addSubview:missedNotifAndUnreadBadgeLabel];
         missedNotifAndUnreadBadgeLabel.center = missedNotifAndUnreadBadgeBgView.center;