diff --git a/CHANGES.rst b/CHANGES.rst
index eec26995f..dcfe2fa2e 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -5,6 +5,7 @@ Bug fix:
  * Room cell: The states of direct chat and favorite buttons are reversed in the menu (#2788).
  * Pasteboard: Fix a crash when passing a nil object to UIPasteboard.
  * RoomVC: Fix crash occurring when tap on an unsent media with retrieved event equal to nil.
+ * Emoji Picker: Background color is not white (#2630).
 
 Changes in 0.10.0 (2019-10-11)
 ===============================================
diff --git a/Riot/Modules/Room/EmojiPicker/EmojiPickerHeaderView.swift b/Riot/Modules/Room/EmojiPicker/EmojiPickerHeaderView.swift
index 66a31781f..0d2424f51 100644
--- a/Riot/Modules/Room/EmojiPicker/EmojiPickerHeaderView.swift
+++ b/Riot/Modules/Room/EmojiPicker/EmojiPickerHeaderView.swift
@@ -26,7 +26,7 @@ final class EmojiPickerHeaderView: UICollectionReusableView, NibReusable {
     // MARK: - Public
     
     func update(theme: Theme) {
-        self.backgroundColor = theme.backgroundColor
+        self.backgroundColor = theme.headerBackgroundColor
         self.titleLabel.textColor = theme.headerTextPrimaryColor
     }
     
diff --git a/Riot/Modules/Room/EmojiPicker/EmojiPickerViewCell.swift b/Riot/Modules/Room/EmojiPicker/EmojiPickerViewCell.swift
index 419b3b557..95e2295ce 100644
--- a/Riot/Modules/Room/EmojiPicker/EmojiPickerViewCell.swift
+++ b/Riot/Modules/Room/EmojiPicker/EmojiPickerViewCell.swift
@@ -90,7 +90,7 @@ final class EmojiPickerViewCell: UICollectionViewCell, NibReusable, Themable {
             reactionBackgroundColor = self.theme?.tintBackgroundColor
             reactionBackgroundBorderWidth = Constants.selectedBorderWidth
         } else {
-            reactionBackgroundColor = self.theme?.headerBackgroundColor
+            reactionBackgroundColor = self.theme?.backgroundColor
             reactionBackgroundBorderWidth = 0.0
         }
         
diff --git a/Riot/Modules/Room/EmojiPicker/EmojiPickerViewController.swift b/Riot/Modules/Room/EmojiPicker/EmojiPickerViewController.swift
index c26d1e3fb..2691714ee 100644
--- a/Riot/Modules/Room/EmojiPicker/EmojiPickerViewController.swift
+++ b/Riot/Modules/Room/EmojiPicker/EmojiPickerViewController.swift
@@ -111,7 +111,7 @@ final class EmojiPickerViewController: UIViewController {
     private func update(theme: Theme) {
         self.theme = theme
         
-        self.view.backgroundColor = theme.headerBackgroundColor
+        self.view.backgroundColor = theme.backgroundColor
         
         if let navigationBar = self.navigationController?.navigationBar {
             theme.applyStyle(onNavigationBar: navigationBar)