diff --git a/CHANGES.rst b/CHANGES.rst
index 1b5212933..6f580afbc 100644
--- a/CHANGES.rst
+++ b/CHANGES.rst
@@ -2,7 +2,8 @@ Changes in 0.8.6 (2019-05-06)
 ===============================================
 
 Bug fix:
- * Device Verification: Fix bell emoji name
+ * Device Verification: Fix bell emoji name.
+ * Device Verification: Fix buttons colors in dark theme.
 
 Changes in 0.8.5 (2019-05-03)
 ===============================================
diff --git a/Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewController.storyboard b/Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewController.storyboard
index 8dede16ab..634dfa15e 100644
--- a/Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewController.storyboard
+++ b/Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewController.storyboard
@@ -79,7 +79,7 @@
                                                         <subviews>
                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DOt-5E-FjF">
                                                                 <rect key="frame" x="20" y="10" width="335" height="30"/>
-                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <state key="normal" title="Continue">
                                                                     <color key="titleColor" red="0.47843137250000001" green="0.78823529410000004" blue="0.63137254899999995" alpha="1" colorSpace="calibratedRGB"/>
                                                                 </state>
diff --git a/Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewController.swift b/Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewController.swift
index 47f5411d1..7013886db 100644
--- a/Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewController.swift
+++ b/Riot/Modules/DeviceVerification/Incoming/DeviceVerificationIncomingViewController.swift
@@ -111,7 +111,7 @@ final class DeviceVerificationIncomingViewController: UIViewController {
         self.description1Label.textColor = theme.textPrimaryColor
         self.description2Label.textColor = theme.textPrimaryColor
 
-        self.continueButton.backgroundColor = theme.backgroundColor
+        self.continueButtonBackgroundView.backgroundColor = theme.backgroundColor
         theme.applyStyle(onButton: self.continueButton)
     }
     
diff --git a/Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.storyboard b/Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.storyboard
index bc2f2fd30..c10d70c1e 100644
--- a/Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.storyboard
+++ b/Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.storyboard
@@ -60,7 +60,7 @@
                                                         <subviews>
                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DOt-5E-FjF">
                                                                 <rect key="frame" x="20" y="10" width="335" height="30"/>
-                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <state key="normal" title="Begin Verifying">
                                                                     <color key="titleColor" red="0.47843137250000001" green="0.78823529410000004" blue="0.63137254899999995" alpha="1" colorSpace="calibratedRGB"/>
                                                                 </state>
diff --git a/Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.swift b/Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.swift
index e4d210a00..9b6d39451 100644
--- a/Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.swift
+++ b/Riot/Modules/DeviceVerification/Start/DeviceVerificationStartViewController.swift
@@ -108,7 +108,7 @@ final class DeviceVerificationStartViewController: UIViewController {
         self.waitingPartnerLabel.textColor = theme.textPrimaryColor
         self.useLegacyVerificationLabel.textColor = theme.textPrimaryColor
 
-        self.verifyButton.backgroundColor = theme.backgroundColor
+        self.verifyButtonBackgroundView.backgroundColor = theme.backgroundColor
         theme.applyStyle(onButton: self.verifyButton)
 
         theme.applyStyle(onButton: self.useLegacyVerificationButton)
diff --git a/Riot/Modules/DeviceVerification/Verified/DeviceVerificationVerifiedViewController.storyboard b/Riot/Modules/DeviceVerification/Verified/DeviceVerificationVerifiedViewController.storyboard
index 8e75a5a02..33334ca01 100644
--- a/Riot/Modules/DeviceVerification/Verified/DeviceVerificationVerifiedViewController.storyboard
+++ b/Riot/Modules/DeviceVerification/Verified/DeviceVerificationVerifiedViewController.storyboard
@@ -58,6 +58,7 @@
                                                                 <subviews>
                                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kgv-EZ-dF9">
                                                                         <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
+                                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="height" constant="50" id="WcJ-IL-5KV"/>
                                                                         </constraints>
diff --git a/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.storyboard b/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.storyboard
index e0ae6c663..9f488dae8 100644
--- a/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.storyboard
+++ b/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.storyboard
@@ -59,7 +59,7 @@
                                                         <subviews>
                                                             <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="DOt-5E-FjF">
                                                                 <rect key="frame" x="156.5" y="10" width="62" height="30"/>
-                                                                <color key="backgroundColor" white="1" alpha="1" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
+                                                                <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                 <state key="normal" title="Continue">
                                                                     <color key="titleColor" red="0.47843137250000001" green="0.78823529410000004" blue="0.63137254899999995" alpha="1" colorSpace="calibratedRGB"/>
                                                                 </state>
diff --git a/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.swift b/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.swift
index a5b2a9292..80e7136bf 100644
--- a/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.swift
+++ b/Riot/Modules/DeviceVerification/Verify/DeviceVerificationVerifyViewController.swift
@@ -111,7 +111,7 @@ final class DeviceVerificationVerifyViewController: UIViewController {
         self.decimalLabel.textColor = theme.textPrimaryColor
         self.waitingPartnerLabel.textColor = theme.textPrimaryColor
 
-        self.continueButton.backgroundColor = theme.backgroundColor
+        self.continueButtonBackgroundView.backgroundColor = theme.backgroundColor
         theme.applyStyle(onButton: self.continueButton)
 
         emojisCollectionView.reloadData()
diff --git a/Tools/Templates/buildable/SimpleScreenTemplate/SimpleScreenTemplateViewController.storyboard b/Tools/Templates/buildable/SimpleScreenTemplate/SimpleScreenTemplateViewController.storyboard
index 5a96435e9..971f172ed 100644
--- a/Tools/Templates/buildable/SimpleScreenTemplate/SimpleScreenTemplateViewController.storyboard
+++ b/Tools/Templates/buildable/SimpleScreenTemplate/SimpleScreenTemplateViewController.storyboard
@@ -59,6 +59,7 @@
                                                                 <subviews>
                                                                     <button opaque="NO" contentMode="scaleToFill" contentHorizontalAlignment="center" contentVerticalAlignment="center" buttonType="roundedRect" lineBreakMode="middleTruncation" translatesAutoresizingMaskIntoConstraints="NO" id="kgv-EZ-dF9">
                                                                         <rect key="frame" x="0.0" y="0.0" width="375" height="50"/>
+                                                                        <color key="backgroundColor" white="0.0" alpha="0.0" colorSpace="custom" customColorSpace="genericGamma22GrayColorSpace"/>
                                                                         <constraints>
                                                                             <constraint firstAttribute="height" constant="50" id="WcJ-IL-5KV"/>
                                                                         </constraints>