diff --git a/Riot/Views/RoomList/RecentTableViewCell.m b/Riot/Views/RoomList/RecentTableViewCell.m
index b0bf69a75..48c15da08 100644
--- a/Riot/Views/RoomList/RecentTableViewCell.m
+++ b/Riot/Views/RoomList/RecentTableViewCell.m
@@ -25,6 +25,11 @@
 
 #import "MXRoomSummary+Riot.h"
 
+#pragma mark - Defines & Constants
+
+static const CGFloat kDirectRoomBorderColorAlpha = 0.75;
+static const CGFloat kDirectRoomBorderWidth = 3.0;
+
 @implementation RecentTableViewCell
 
 #pragma mark - Class methods
@@ -48,10 +53,14 @@
     self.missedNotifAndUnreadBadgeLabel.textColor = kRiotPrimaryBgColor;
     
     // Prepare direct room border
+    CGColorRef directRoomBorderColor = CGColorCreateCopyWithAlpha(kRiotColorGreen.CGColor, kDirectRoomBorderColorAlpha);
+    
     [self.directRoomBorderView.layer setCornerRadius:self.directRoomBorderView.frame.size.width / 2];
     self.directRoomBorderView.clipsToBounds = YES;
-    self.directRoomBorderView.layer.borderColor = CGColorCreateCopyWithAlpha(kRiotColorGreen.CGColor, 0.75);
-    self.directRoomBorderView.layer.borderWidth = 3;
+    self.directRoomBorderView.layer.borderColor = directRoomBorderColor;
+    self.directRoomBorderView.layer.borderWidth = kDirectRoomBorderWidth;
+    
+    CFRelease(directRoomBorderColor);
     
     self.roomAvatar.defaultBackgroundColor = [UIColor clearColor];
 }
diff --git a/Riot/Views/RoomList/RoomCollectionViewCell.m b/Riot/Views/RoomList/RoomCollectionViewCell.m
index e5492ac38..d1844a06b 100644
--- a/Riot/Views/RoomList/RoomCollectionViewCell.m
+++ b/Riot/Views/RoomList/RoomCollectionViewCell.m
@@ -24,6 +24,11 @@
 
 #import "MXTools.h"
 
+#pragma mark - Defines & Constants
+
+static const CGFloat kDirectRoomBorderColorAlpha = 0.75;
+static const CGFloat kDirectRoomBorderWidth = 3.0;
+
 @implementation RoomCollectionViewCell
 
 #pragma mark - Class methods
@@ -66,10 +71,14 @@
     self.missedNotifAndUnreadBadgeLabel.textColor = kRiotPrimaryBgColor;
     
     // Prepare direct room border
+    CGColorRef directRoomBorderColor = CGColorCreateCopyWithAlpha(kRiotColorGreen.CGColor, kDirectRoomBorderColorAlpha);
+    
     [self.directRoomBorderView.layer setCornerRadius:self.directRoomBorderView.frame.size.width / 2];
     self.directRoomBorderView.clipsToBounds = YES;
-    self.directRoomBorderView.layer.borderColor = CGColorCreateCopyWithAlpha(kRiotColorGreen.CGColor, 0.75);
-    self.directRoomBorderView.layer.borderWidth = 3;
+    self.directRoomBorderView.layer.borderColor = directRoomBorderColor;
+    self.directRoomBorderView.layer.borderWidth = kDirectRoomBorderWidth;
+    
+    CFRelease(directRoomBorderColor);
     
     self.editionArrowView.backgroundColor = kRiotSecondaryBgColor;
     
diff --git a/Riot/Views/RoomList/RoomTableViewCell.m b/Riot/Views/RoomList/RoomTableViewCell.m
index 4f33d2821..b4d53ca5b 100644
--- a/Riot/Views/RoomList/RoomTableViewCell.m
+++ b/Riot/Views/RoomList/RoomTableViewCell.m
@@ -20,6 +20,11 @@
 #import "RiotDesignValues.h"
 #import "MXRoomSummary+Riot.h"
 
+#pragma mark - Defines & Constants
+
+static const CGFloat kDirectRoomBorderColorAlpha = 0.75;
+static const CGFloat kDirectRoomBorderWidth = 3.0;
+
 @implementation RoomTableViewCell
 
 #pragma mark - Class methods
@@ -31,10 +36,14 @@
     self.titleLabel.textColor = kRiotPrimaryTextColor;
     
     // Prepare direct room border
+    CGColorRef directRoomBorderColor = CGColorCreateCopyWithAlpha(kRiotColorGreen.CGColor, kDirectRoomBorderColorAlpha);
+    
     [self.directRoomBorderView.layer setCornerRadius:self.directRoomBorderView.frame.size.width / 2];
     self.directRoomBorderView.clipsToBounds = YES;
-    self.directRoomBorderView.layer.borderColor = CGColorCreateCopyWithAlpha(kRiotColorGreen.CGColor, 0.75);
-    self.directRoomBorderView.layer.borderWidth = 3;
+    self.directRoomBorderView.layer.borderColor = directRoomBorderColor;
+    self.directRoomBorderView.layer.borderWidth = kDirectRoomBorderWidth;
+    
+    CFRelease(directRoomBorderColor);
     
     self.avatarImageView.defaultBackgroundColor = [UIColor clearColor];
 }