diff --git a/submodules/SettingsUI/Sources/Themes/ThemePreviewController.swift b/submodules/SettingsUI/Sources/Themes/ThemePreviewController.swift
index fe2d7d90e6..1575f79422 100644
--- a/submodules/SettingsUI/Sources/Themes/ThemePreviewController.swift
+++ b/submodules/SettingsUI/Sources/Themes/ThemePreviewController.swift
@@ -367,6 +367,12 @@ public final class ThemePreviewController: ViewController {
                         updatedSettings = currentSettings.withUpdatedTheme(updatedTheme)
                     }
                     
+                    var themeSpecificAccentColors = updatedSettings.themeSpecificAccentColors
+                    if case let .cloud(info) = updatedTheme, let settings = info.theme.settings {
+                        let baseThemeReference = PresentationThemeReference.builtin(PresentationBuiltinThemeReference(baseTheme: settings.baseTheme))
+                        themeSpecificAccentColors[baseThemeReference.index] = PresentationThemeAccentColor(themeIndex: updatedTheme.index)
+                    }
+                    
                     var themeSpecificChatWallpapers = updatedSettings.themeSpecificChatWallpapers
                     themeSpecificChatWallpapers[updatedTheme.index] = nil
                     return updatedSettings.withUpdatedThemeSpecificChatWallpapers(themeSpecificChatWallpapers)
diff --git a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryToolbarNode.swift b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryToolbarNode.swift
index d00958df6a..97e93331b7 100644
--- a/submodules/SettingsUI/Sources/Themes/WallpaperGalleryToolbarNode.swift
+++ b/submodules/SettingsUI/Sources/Themes/WallpaperGalleryToolbarNode.swift
@@ -47,6 +47,9 @@ final class WallpaperGalleryToolbarNode: ASDisplayNode {
         self.cancelButtonType = cancelButtonType
         self.doneButtonType = doneButtonType
         
+        self.cancelHighlightBackgroundNode.alpha = 0.0
+        self.doneHighlightBackgroundNode.alpha = 0.0
+        
         super.init()
         
         self.addSubnode(self.cancelHighlightBackgroundNode)