diff --git a/Riot/Modules/Room/BubbleReactions/BubbleReactionViewCell.swift b/Riot/Modules/Room/BubbleReactions/BubbleReactionViewCell.swift
index 3b3d46a03..c6e2af626 100644
--- a/Riot/Modules/Room/BubbleReactions/BubbleReactionViewCell.swift
+++ b/Riot/Modules/Room/BubbleReactions/BubbleReactionViewCell.swift
@@ -81,8 +81,9 @@ final class BubbleReactionViewCell: UICollectionViewCell, NibReusable, Themable
     
     func update(theme: Theme) {
         self.theme = theme
-        self.reactionBackgroundView.layer.borderColor = self.theme?.tintColor.cgColor
-        self.countLabel.textColor = self.theme?.textPrimaryColor
+        self.reactionBackgroundView.layer.borderColor = theme.tintColor.cgColor
+        self.emojiLabel.textColor = theme.textPrimaryColor
+        self.countLabel.textColor = theme.textPrimaryColor
         self.updateViews()
     }
     
diff --git a/Riot/Modules/Room/BubbleReactions/BubbleReactionViewCell.xib b/Riot/Modules/Room/BubbleReactions/BubbleReactionViewCell.xib
index db90d9281..17552af69 100644
--- a/Riot/Modules/Room/BubbleReactions/BubbleReactionViewCell.xib
+++ b/Riot/Modules/Room/BubbleReactions/BubbleReactionViewCell.xib
@@ -13,23 +13,26 @@
         <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner"/>
         <placeholder placeholderIdentifier="IBFirstResponder" id="-2" customClass="UIResponder"/>
         <collectionViewCell opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center" id="gTV-IL-0wX" customClass="BubbleReactionViewCell" customModule="Riot" customModuleProvider="target">
-            <rect key="frame" x="0.0" y="0.0" width="66" height="22"/>
+            <rect key="frame" x="0.0" y="0.0" width="36" height="22"/>
             <autoresizingMask key="autoresizingMask"/>
             <view key="contentView" opaque="NO" clipsSubviews="YES" multipleTouchEnabled="YES" contentMode="center">
-                <rect key="frame" x="0.0" y="0.0" width="66" height="22"/>
+                <rect key="frame" x="0.0" y="0.0" width="36" height="22"/>
                 <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
                 <subviews>
                     <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="jjn-uq-kYN">
-                        <rect key="frame" x="1" y="1" width="64" height="20"/>
+                        <rect key="frame" x="1" y="1" width="34" height="20"/>
                         <subviews>
                             <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="252" verticalHuggingPriority="251" horizontalCompressionResistancePriority="751" text="👍" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="gyn-ux-gmi">
-                                <rect key="frame" x="6" y="4" width="24" height="12"/>
+                                <rect key="frame" x="6" y="4" width="16" height="12"/>
+                                <constraints>
+                                    <constraint firstAttribute="width" relation="lessThanOrEqual" constant="78" id="Q7V-Pd-1Wc"/>
+                                </constraints>
                                 <fontDescription key="fontDescription" type="system" pointSize="11"/>
                                 <nil key="textColor"/>
                                 <nil key="highlightedColor"/>
                             </label>
-                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="230" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DQc-oh-Wus">
-                                <rect key="frame" x="32" y="3" width="26" height="14"/>
+                            <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="1" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="DQc-oh-Wus">
+                                <rect key="frame" x="24" y="3" width="4" height="14"/>
                                 <constraints>
                                     <constraint firstAttribute="width" relation="lessThanOrEqual" constant="26" id="qaD-Xb-kVP"/>
                                 </constraints>
@@ -57,13 +60,13 @@
                 <constraint firstAttribute="trailing" secondItem="jjn-uq-kYN" secondAttribute="trailing" constant="1" id="ztM-7J-Dnf"/>
             </constraints>
             <viewLayoutGuide key="safeArea" id="ZTg-uK-7eu"/>
-            <size key="customSize" width="443" height="170"/>
+            <size key="customSize" width="413" height="170"/>
             <connections>
                 <outlet property="countLabel" destination="DQc-oh-Wus" id="GZt-aS-umB"/>
                 <outlet property="emojiLabel" destination="gyn-ux-gmi" id="qme-DX-UAc"/>
                 <outlet property="reactionBackgroundView" destination="jjn-uq-kYN" id="Q0x-Np-wEa"/>
             </connections>
-            <point key="canvasLocation" x="-459.4202898550725" y="-207.58928571428569"/>
+            <point key="canvasLocation" x="-481.15942028985512" y="-207.58928571428569"/>
         </collectionViewCell>
     </objects>
 </document>