diff --git a/Riot/Modules/Common/ActivityIndicator/ActivityIndicatorPresenter.swift b/Riot/Modules/Common/ActivityIndicator/ActivityIndicatorPresenter.swift
index 41b569446..6acfaec94 100755
--- a/Riot/Modules/Common/ActivityIndicator/ActivityIndicatorPresenter.swift
+++ b/Riot/Modules/Common/ActivityIndicator/ActivityIndicatorPresenter.swift
@@ -24,8 +24,8 @@ final class ActivityIndicatorPresenter: ActivityIndicatorPresenterType {
     
     private enum Constants {
         static let animationDuration: TimeInterval = 0.3
-        static let backgroundOverlayColor = UIColor.black
-        static let backgroundOverlayAlpha: CGFloat = 0.3
+        static let backgroundOverlayColor = UIColor.clear
+        static let backgroundOverlayAlpha: CGFloat = 1.0
     }
     
     // MARK: - Properties
diff --git a/Riot/Modules/Common/ActivityIndicator/ActivityIndicatorView.swift b/Riot/Modules/Common/ActivityIndicator/ActivityIndicatorView.swift
index 4519854ba..8ab41098f 100755
--- a/Riot/Modules/Common/ActivityIndicator/ActivityIndicatorView.swift
+++ b/Riot/Modules/Common/ActivityIndicator/ActivityIndicatorView.swift
@@ -19,11 +19,19 @@ import Reusable
 
 final class ActivityIndicatorView: UIView, NibOwnerLoadable {
     
+    // MARK: - Constants
+    
+    private enum Constants {
+        static let cornerRadius: CGFloat = 5.0
+        static let activityIndicatorMargin = CGSize(width: 30.0, height: 30.0)
+    }
+    
     // MARK: - Properties
     
     // MARK: Outlets
     
     @IBOutlet private weak var activityIndicatorView: UIActivityIndicatorView!
+    @IBOutlet private weak var activityIndicatorBackgroundView: UIView!
     
     // MARK: Public
     
@@ -39,6 +47,7 @@ final class ActivityIndicatorView: UIView, NibOwnerLoadable {
     // MARK: - Setup
     
     private func commonInit() {        
+        self.activityIndicatorBackgroundView.layer.masksToBounds = true
     }
     
     convenience init() {
@@ -60,7 +69,14 @@ final class ActivityIndicatorView: UIView, NibOwnerLoadable {
     // MARK: - Overrides
     
     override var intrinsicContentSize: CGSize {
-        return CGSize(width: self.activityIndicatorView.intrinsicContentSize.width, height: self.activityIndicatorView.intrinsicContentSize.height)
+        return CGSize(width: self.activityIndicatorView.intrinsicContentSize.width + Constants.activityIndicatorMargin.width,
+                      height: self.activityIndicatorView.intrinsicContentSize.height + Constants.activityIndicatorMargin.height)
+    }
+    
+    override func layoutSubviews() {
+        super.layoutSubviews()
+        
+        self.activityIndicatorBackgroundView.layer.cornerRadius = Constants.cornerRadius
     }
     
     // MARK: - Public
diff --git a/Riot/Modules/Common/ActivityIndicator/ActivityIndicatorView.xib b/Riot/Modules/Common/ActivityIndicator/ActivityIndicatorView.xib
index 9dddf369c..874a4e665 100755
--- a/Riot/Modules/Common/ActivityIndicator/ActivityIndicatorView.xib
+++ b/Riot/Modules/Common/ActivityIndicator/ActivityIndicatorView.xib
@@ -1,17 +1,18 @@
 <?xml version="1.0" encoding="UTF-8"?>
-<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14113" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="14460.31" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" useSafeAreas="YES" colorMatched="YES">
     <device id="retina4_7" orientation="portrait">
         <adaptation id="fullscreen"/>
     </device>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14460.20"/>
         <capability name="Safe area layout guides" minToolsVersion="9.0"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
-        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ActivityIndicatorView" customModule="Tchap" customModuleProvider="target">
+        <placeholder placeholderIdentifier="IBFilesOwner" id="-1" userLabel="File's Owner" customClass="ActivityIndicatorView" customModule="Riot" customModuleProvider="target">
             <connections>
+                <outlet property="activityIndicatorBackgroundView" destination="2qY-Ui-WjQ" id="obw-ml-Ppb"/>
                 <outlet property="activityIndicatorView" destination="32q-cl-Ru4" id="38r-gn-BJg"/>
             </connections>
         </placeholder>
@@ -20,14 +21,28 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="204"/>
             <autoresizingMask key="autoresizingMask" flexibleMaxX="YES" flexibleMaxY="YES"/>
             <subviews>
-                <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" style="whiteLarge" translatesAutoresizingMaskIntoConstraints="NO" id="32q-cl-Ru4">
-                    <rect key="frame" x="169" y="84" width="37" height="37"/>
-                </activityIndicatorView>
+                <view contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="2qY-Ui-WjQ">
+                    <rect key="frame" x="0.0" y="0.0" width="375" height="204"/>
+                    <subviews>
+                        <activityIndicatorView opaque="NO" contentMode="scaleToFill" horizontalHuggingPriority="750" verticalHuggingPriority="750" style="white" translatesAutoresizingMaskIntoConstraints="NO" id="32q-cl-Ru4">
+                            <rect key="frame" x="15" y="15" width="345" height="174"/>
+                        </activityIndicatorView>
+                    </subviews>
+                    <color key="backgroundColor" red="0.80000000000000004" green="0.80000000000000004" blue="0.80000000000000004" alpha="0.89787029109589045" colorSpace="calibratedRGB"/>
+                    <constraints>
+                        <constraint firstItem="32q-cl-Ru4" firstAttribute="top" secondItem="2qY-Ui-WjQ" secondAttribute="top" constant="15" id="hLL-Ao-h6a"/>
+                        <constraint firstItem="32q-cl-Ru4" firstAttribute="centerX" secondItem="2qY-Ui-WjQ" secondAttribute="centerX" id="n1z-Rb-ce3"/>
+                        <constraint firstItem="32q-cl-Ru4" firstAttribute="leading" secondItem="2qY-Ui-WjQ" secondAttribute="leading" constant="15" id="tTB-ZQ-Xrm"/>
+                        <constraint firstItem="32q-cl-Ru4" firstAttribute="centerY" secondItem="2qY-Ui-WjQ" secondAttribute="centerY" id="ty6-5W-zen"/>
+                    </constraints>
+                </view>
             </subviews>
             <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
             <constraints>
-                <constraint firstItem="32q-cl-Ru4" firstAttribute="centerX" secondItem="Zud-2y-G9d" secondAttribute="centerX" id="9Qy-We-LT9"/>
-                <constraint firstItem="32q-cl-Ru4" firstAttribute="centerY" secondItem="Zud-2y-G9d" secondAttribute="centerY" id="aRt-Hq-AdI"/>
+                <constraint firstItem="Zud-2y-G9d" firstAttribute="bottom" secondItem="2qY-Ui-WjQ" secondAttribute="bottom" id="F2N-Wt-CCH"/>
+                <constraint firstItem="2qY-Ui-WjQ" firstAttribute="top" secondItem="Zud-2y-G9d" secondAttribute="top" id="V7A-HL-11f"/>
+                <constraint firstItem="2qY-Ui-WjQ" firstAttribute="leading" secondItem="Zud-2y-G9d" secondAttribute="leading" id="jbB-4Q-tNb"/>
+                <constraint firstItem="Zud-2y-G9d" firstAttribute="trailing" secondItem="2qY-Ui-WjQ" secondAttribute="trailing" id="psU-2p-PBH"/>
             </constraints>
             <nil key="simulatedStatusBarMetrics"/>
             <nil key="simulatedTopBarMetrics"/>