diff --git a/Riot/Managers/Theme/Theme.swift b/Riot/Managers/Theme/Theme.swift
index c913ffd65..c8a10674a 100644
--- a/Riot/Managers/Theme/Theme.swift
+++ b/Riot/Managers/Theme/Theme.swift
@@ -46,9 +46,6 @@ import UIKit
 
     var noticeColor: UIColor { get }
     var noticeSecondaryColor: UIColor { get }
-        
-    var reactionButtonSelectedBackgroundColor: UIColor { get }
-    var reactionButtonSelectedBorderColor: UIColor { get }
 
     /// Color for errors or warnings
     var warningColor: UIColor { get }
diff --git a/Riot/Managers/Theme/Themes/DarkTheme.swift b/Riot/Managers/Theme/Themes/DarkTheme.swift
index 1033dae9d..c98b27a24 100644
--- a/Riot/Managers/Theme/Themes/DarkTheme.swift
+++ b/Riot/Managers/Theme/Themes/DarkTheme.swift
@@ -39,15 +39,12 @@ class DarkTheme: NSObject, Theme {
     var textSecondaryColor: UIColor = UIColor(rgb: 0xA1B2D1)
 
     var tintColor: UIColor = UIColor(rgb: 0x03B381)
-    var tintBackgroundColor: UIColor = UIColor(rgb: 0xe9fff9)
+    var tintBackgroundColor: UIColor = UIColor(rgb: 0x1F6954)
     var unreadRoomIndentColor: UIColor = UIColor(rgb: 0x2E3648)
     var lineBreakColor: UIColor = UIColor(rgb: 0x61708B)
     
     var noticeColor: UIColor = UIColor(rgb: 0xFF4B55)
     var noticeSecondaryColor: UIColor = UIColor(rgb: 0x61708B)
-        
-    var reactionButtonSelectedBackgroundColor: UIColor = UIColor(rgb: 0x1F6954)
-    var reactionButtonSelectedBorderColor: UIColor = UIColor(rgb: 0x03B381)
 
     var warningColor: UIColor = UIColor(rgb: 0xFF4B55)
 
diff --git a/Riot/Managers/Theme/Themes/DefaultTheme.swift b/Riot/Managers/Theme/Themes/DefaultTheme.swift
index 87db69334..7f154f232 100644
--- a/Riot/Managers/Theme/Themes/DefaultTheme.swift
+++ b/Riot/Managers/Theme/Themes/DefaultTheme.swift
@@ -45,9 +45,6 @@ class DefaultTheme: NSObject, Theme {
     
     var noticeColor: UIColor = UIColor(rgb: 0xFF4B55)
     var noticeSecondaryColor: UIColor = UIColor(rgb: 0x61708B)
-    
-    var reactionButtonSelectedBackgroundColor: UIColor = UIColor(rgb: 0xE9FFF9)
-    var reactionButtonSelectedBorderColor: UIColor = UIColor(rgb: 0x03B381)
 
     var warningColor: UIColor = UIColor(rgb: 0xFF4B55)
 
diff --git a/Riot/Modules/Room/BubbleReactions/BubbleReactionViewCell.swift b/Riot/Modules/Room/BubbleReactions/BubbleReactionViewCell.swift
index 34561134d..3b3d46a03 100644
--- a/Riot/Modules/Room/BubbleReactions/BubbleReactionViewCell.swift
+++ b/Riot/Modules/Room/BubbleReactions/BubbleReactionViewCell.swift
@@ -81,7 +81,7 @@ final class BubbleReactionViewCell: UICollectionViewCell, NibReusable, Themable
     
     func update(theme: Theme) {
         self.theme = theme
-        self.reactionBackgroundView.layer.borderColor = self.theme?.reactionButtonSelectedBorderColor.cgColor
+        self.reactionBackgroundView.layer.borderColor = self.theme?.tintColor.cgColor
         self.countLabel.textColor = self.theme?.textPrimaryColor
         self.updateViews()
     }
@@ -94,7 +94,7 @@ final class BubbleReactionViewCell: UICollectionViewCell, NibReusable, Themable
         let reactionBackgroundBorderWidth: CGFloat
         
         if self.isReactionSelected {
-            reactionBackgroundColor = self.theme?.reactionButtonSelectedBackgroundColor
+            reactionBackgroundColor = self.theme?.tintBackgroundColor
             reactionBackgroundBorderWidth = Constants.selectedBorderWidth
         } else {
             reactionBackgroundColor = self.theme?.headerBackgroundColor