diff --git a/CHANGES.rst b/CHANGES.rst
index 0aad4163b..28ae5d99f 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -10,6 +10,7 @@ Changes to be released in next version
 
 🐛 Bugfix
  * SSO: Handle login callback URL with HTML entities (#4129).
+ * Share extension: Fix theme in dark mode (#4486).
 
 ⚠️ API Changes
  * 
diff --git a/RiotShareExtension/Modules/Fallback/FallbackViewController.m b/RiotShareExtension/Modules/Fallback/FallbackViewController.m
index da7ebc5f1..ce5774a69 100644
--- a/RiotShareExtension/Modules/Fallback/FallbackViewController.m
+++ b/RiotShareExtension/Modules/Fallback/FallbackViewController.m
@@ -36,6 +36,7 @@
 {
     [super viewDidLoad];
     
+    self.view.backgroundColor = ThemeService.shared.theme.backgroundColor;
     self.titleLabel.textColor = ThemeService.shared.theme.textSecondaryColor;
     self.titleLabel.text = NSLocalizedStringFromTable(@"share_extension_auth_prompt", @"Vector", nil);
     self.logoImageView.tintColor = ThemeService.shared.theme.tintColor;
diff --git a/RiotShareExtension/Modules/Share/Listing/RoomsListViewController.m b/RiotShareExtension/Modules/Share/Listing/RoomsListViewController.m
index 52ccd3af3..777249a6e 100644
--- a/RiotShareExtension/Modules/Share/Listing/RoomsListViewController.m
+++ b/RiotShareExtension/Modules/Share/Listing/RoomsListViewController.m
@@ -75,6 +75,7 @@
 {
     [super viewDidLoad];
     
+    self.recentsTableView.backgroundColor = ThemeService.shared.theme.backgroundColor;
     [self.recentsTableView registerNib:[RecentRoomTableViewCell nib] forCellReuseIdentifier:[RecentRoomTableViewCell defaultReuseIdentifier]];
     
     [self configureSearchBar];
@@ -97,6 +98,7 @@
     self.recentsSearchBar.searchBarStyle = UISearchBarStyleMinimal;
     self.recentsSearchBar.placeholder = NSLocalizedStringFromTable(@"search_default_placeholder", @"Vector", nil);
     self.recentsSearchBar.tintColor = ThemeService.shared.theme.tintColor;
+    self.recentsSearchBar.backgroundColor = ThemeService.shared.theme.baseColor;
     
     _tableSearchBar.tintColor = self.recentsSearchBar.tintColor;
 }
diff --git a/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m b/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m
index c6c81052a..14a16a68f 100644
--- a/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m
+++ b/RiotShareExtension/Modules/Share/Listing/Views/RecentRoomTableViewCell.m
@@ -17,6 +17,8 @@
 #import "RecentRoomTableViewCell.h"
 
 #import "MXRoomSummary+Riot.h"
+#import "ThemeService.h"
+#import "RiotShareExtension-Swift.h"
 
 @interface RecentRoomTableViewCell ()
 
@@ -44,6 +46,14 @@
     return nil;
 }
 
+- (void)awakeFromNib
+{
+    [super awakeFromNib];
+    
+    self.roomTitleLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
+    self.contentView.backgroundColor = ThemeService.shared.theme.backgroundColor;
+}
+
 - (void)layoutSubviews
 {
     [super layoutSubviews];
diff --git a/RiotShareExtension/Modules/Share/ShareViewController.m b/RiotShareExtension/Modules/Share/ShareViewController.m
index 5d8aa81fd..54976634b 100644
--- a/RiotShareExtension/Modules/Share/ShareViewController.m
+++ b/RiotShareExtension/Modules/Share/ShareViewController.m
@@ -21,11 +21,14 @@
 #import "ShareDataSource.h"
 #import "ShareExtensionManager.h"
 
+#import "ThemeService.h"
+#import "RiotShareExtension-Swift.h"
+
 
 @interface ShareViewController ()
 
 @property (weak, nonatomic) IBOutlet UIView *masterContainerView;
-@property (weak, nonatomic) IBOutlet UILabel *tittleLabel;
+@property (weak, nonatomic) IBOutlet UILabel *titleLabel;
 @property (weak, nonatomic) IBOutlet UIView *contentView;
 
 @property (nonatomic) SegmentedViewController *segmentedViewController;
@@ -44,6 +47,10 @@
 {
     [super viewDidLoad];
     
+    self.view.tintColor = ThemeService.shared.theme.tintColor;
+    self.titleLabel.textColor = ThemeService.shared.theme.textPrimaryColor;
+    self.masterContainerView.backgroundColor = ThemeService.shared.theme.baseColor;
+    
     self.shareExtensionManagerDidUpdateAccountDataObserver = [[NSNotificationCenter defaultCenter] addObserverForName:kShareExtensionManagerDidUpdateAccountDataNotification object:nil queue:[NSOperationQueue mainQueue] usingBlock:^(NSNotification *notif) {
         
         [self configureViews];
@@ -96,14 +103,14 @@
     
     if ([ShareExtensionManager sharedManager].userAccount)
     {
-        self.tittleLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"send_to", @"Vector", nil), @""];
+        self.titleLabel.text = [NSString stringWithFormat:NSLocalizedStringFromTable(@"send_to", @"Vector", nil), @""];
         [self configureSegmentedViewController];
     }
     else
     {
         NSDictionary *infoDictionary = [NSBundle mainBundle].infoDictionary;
         NSString *bundleDisplayName = infoDictionary[@"CFBundleDisplayName"];
-        self.tittleLabel.text = bundleDisplayName;
+        self.titleLabel.text = bundleDisplayName;
         [self configureFallbackViewController];
     }
 }
diff --git a/RiotShareExtension/Modules/Share/ShareViewController.xib b/RiotShareExtension/Modules/Share/ShareViewController.xib
index 517dbd282..04a1316c8 100644
--- a/RiotShareExtension/Modules/Share/ShareViewController.xib
+++ b/RiotShareExtension/Modules/Share/ShareViewController.xib
@@ -1,12 +1,9 @@
 <?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" colorMatched="YES">
-    <device id="retina4_7" orientation="portrait">
-        <adaptation id="fullscreen"/>
-    </device>
+<document type="com.apple.InterfaceBuilder3.CocoaTouch.XIB" version="3.0" toolsVersion="18122" targetRuntime="iOS.CocoaTouch" propertyAccessControl="none" useAutolayout="YES" useTraitCollections="YES" colorMatched="YES">
+    <device id="retina4_7" orientation="portrait" appearance="light"/>
     <dependencies>
         <deployment identifier="iOS"/>
-        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="14088"/>
-        <capability name="Aspect ratio constraints" minToolsVersion="5.1"/>
+        <plugIn identifier="com.apple.InterfaceBuilder.IBCocoaTouchPlugin" version="18093"/>
         <capability name="documents saved in the Xcode 8 format" minToolsVersion="8.0"/>
     </dependencies>
     <objects>
@@ -14,7 +11,7 @@
             <connections>
                 <outlet property="contentView" destination="jAn-9F-DlU" id="NWV-TS-MGK"/>
                 <outlet property="masterContainerView" destination="oax-z3-vv0" id="KvN-B4-ZkF"/>
-                <outlet property="tittleLabel" destination="BQ5-AW-rsV" id="qm6-T7-3LB"/>
+                <outlet property="titleLabel" destination="BQ5-AW-rsV" id="qm6-T7-3LB"/>
                 <outlet property="view" destination="Bej-An-0PZ" id="sgO-5Q-y1c"/>
             </connections>
         </placeholder>
@@ -23,10 +20,6 @@
             <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
             <autoresizingMask key="autoresizingMask" widthSizable="YES" heightSizable="YES"/>
             <subviews>
-                <view alpha="0.59999999999999998" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="0SU-xL-B4a" userLabel="Overlay View">
-                    <rect key="frame" x="0.0" y="0.0" width="375" height="667"/>
-                    <color key="backgroundColor" red="0.16337278091968011" green="0.16337278091968011" blue="0.16337278091968011" alpha="1" colorSpace="custom" customColorSpace="displayP3"/>
-                </view>
                 <view clipsSubviews="YES" contentMode="scaleToFill" translatesAutoresizingMaskIntoConstraints="NO" id="oax-z3-vv0" userLabel="Master Container View">
                     <rect key="frame" x="30" y="58.5" width="315" height="550"/>
                     <subviews>
@@ -34,7 +27,7 @@
                             <rect key="frame" x="0.0" y="0.0" width="315" height="40"/>
                             <subviews>
                                 <label opaque="NO" userInteractionEnabled="NO" contentMode="left" horizontalHuggingPriority="251" verticalHuggingPriority="251" text="Label" textAlignment="natural" lineBreakMode="tailTruncation" baselineAdjustment="alignBaselines" adjustsFontSizeToFit="NO" translatesAutoresizingMaskIntoConstraints="NO" id="BQ5-AW-rsV" userLabel="Title Label">
-                                    <rect key="frame" x="133" y="8" width="50.5" height="24"/>
+                                    <rect key="frame" x="132.5" y="8" width="50" height="24"/>
                                     <fontDescription key="fontDescription" type="system" weight="semibold" pointSize="20"/>
                                     <color key="textColor" white="0.33333333333333331" alpha="1" colorSpace="calibratedWhite"/>
                                     <nil key="highlightedColor"/>
@@ -81,11 +74,8 @@
             </subviews>
             <color key="backgroundColor" red="0.0" green="0.0" blue="0.0" alpha="0.0" colorSpace="custom" customColorSpace="sRGB"/>
             <constraints>
-                <constraint firstAttribute="bottom" secondItem="0SU-xL-B4a" secondAttribute="bottom" id="51f-Wf-Yg2"/>
                 <constraint firstAttribute="bottom" secondItem="oax-z3-vv0" secondAttribute="bottom" priority="750" constant="10" id="Qjd-aK-VSL"/>
                 <constraint firstAttribute="trailing" relation="greaterThanOrEqual" secondItem="oax-z3-vv0" secondAttribute="trailing" constant="30" id="VUX-RZ-Jke"/>
-                <constraint firstItem="0SU-xL-B4a" firstAttribute="top" secondItem="Bej-An-0PZ" secondAttribute="top" id="avs-GA-7eh"/>
-                <constraint firstAttribute="trailing" secondItem="0SU-xL-B4a" secondAttribute="trailing" id="bgh-PD-Xqx"/>
                 <constraint firstAttribute="trailing" secondItem="oax-z3-vv0" secondAttribute="trailing" priority="750" constant="30" id="cYZ-zQ-1Dh"/>
                 <constraint firstItem="oax-z3-vv0" firstAttribute="leading" relation="greaterThanOrEqual" secondItem="Bej-An-0PZ" secondAttribute="leading" constant="30" id="h8V-gU-iRt"/>
                 <constraint firstItem="oax-z3-vv0" firstAttribute="centerY" secondItem="Bej-An-0PZ" secondAttribute="centerY" id="lbe-HZ-ZsR"/>
@@ -94,7 +84,6 @@
                 <constraint firstAttribute="bottom" relation="greaterThanOrEqual" secondItem="oax-z3-vv0" secondAttribute="bottom" constant="10" id="qnO-IP-fp3"/>
                 <constraint firstItem="oax-z3-vv0" firstAttribute="leading" secondItem="Bej-An-0PZ" secondAttribute="leading" priority="750" constant="30" id="sYU-AK-85d"/>
                 <constraint firstItem="oax-z3-vv0" firstAttribute="top" relation="greaterThanOrEqual" secondItem="Bej-An-0PZ" secondAttribute="top" constant="40" id="vXO-uW-nFN"/>
-                <constraint firstItem="0SU-xL-B4a" firstAttribute="leading" secondItem="Bej-An-0PZ" secondAttribute="leading" id="wol-Zy-dCb"/>
             </constraints>
             <point key="canvasLocation" x="39.5" y="89.5"/>
         </view>