diff --git a/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m b/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m
index d30529d4e..34fdc4657 100644
--- a/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m
+++ b/Signal/src/ViewControllers/AppSettings/AdvancedSettingsTableViewController.m
@@ -198,7 +198,8 @@ NS_ASSUME_NONNULL_BEGIN
 #ifdef THEME_ENABLED
     OWSTableSection *themeSection = [OWSTableSection new];
     themeSection.headerTitle = NSLocalizedString(@"THEME_SECTION", nil);
-    [themeSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_ADVANCED_THEME", @"")
+    [themeSection addItem:[OWSTableItem switchItemWithText:NSLocalizedString(@"SETTINGS_ADVANCED_DARK_THEME",
+                                                               @"Label for setting that enables dark theme.")
                                                       isOn:[Theme isDarkThemeEnabled]
                                                     target:weakSelf
                                                   selector:@selector(didToggleThemeSwitch:)]];
@@ -289,6 +290,8 @@ NS_ASSUME_NONNULL_BEGIN
 {
     [Theme setIsDarkThemeEnabled:sender.isOn];
 
+    [self updateTableContents];
+
     // TODO: Notify and refresh.
 }
 #endif
diff --git a/Signal/src/ViewControllers/HomeView/HomeViewController.m b/Signal/src/ViewControllers/HomeView/HomeViewController.m
index b44c8b0f7..a7a9f2aee 100644
--- a/Signal/src/ViewControllers/HomeView/HomeViewController.m
+++ b/Signal/src/ViewControllers/HomeView/HomeViewController.m
@@ -805,13 +805,12 @@ NSString *const kArchivedConversationsReuseIdentifier = @"kArchivedConversations
 {
     UITableViewCell *cell = [self.tableView dequeueReusableCellWithIdentifier:kArchivedConversationsReuseIdentifier];
     OWSAssert(cell);
+    [OWSTableItem configureCell:cell];
 
     for (UIView *subview in cell.contentView.subviews) {
         [subview removeFromSuperview];
     }
 
-    cell.backgroundColor = Theme.backgroundColor;
-
     UIImage *disclosureImage = [UIImage imageNamed:(CurrentAppContext().isRTL ? @"NavBarBack" : @"NavBarBackRTL")];
     OWSAssert(disclosureImage);
     UIImageView *disclosureImageView = [UIImageView new];
diff --git a/Signal/translations/en.lproj/Localizable.strings b/Signal/translations/en.lproj/Localizable.strings
index 85fda9c3e..70d49d827 100644
--- a/Signal/translations/en.lproj/Localizable.strings
+++ b/Signal/translations/en.lproj/Localizable.strings
@@ -1889,15 +1889,15 @@
 /* Table header for the 'censorship circumvention' section. */
 "SETTINGS_ADVANCED_CENSORSHIP_CIRCUMVENTION_HEADER" = "Censorship Circumvention";
 
+/* Label for setting that enables dark theme. */
+"SETTINGS_ADVANCED_DARK_THEME" = "Dark Theme";
+
 /* No comment provided by engineer. */
 "SETTINGS_ADVANCED_DEBUGLOG" = "Enable Debug Log";
 
 /* No comment provided by engineer. */
 "SETTINGS_ADVANCED_SUBMIT_DEBUGLOG" = "Submit Debug Log";
 
-/* No comment provided by engineer. */
-"SETTINGS_ADVANCED_THEME" = "Theme";
-
 /* No comment provided by engineer. */
 "SETTINGS_ADVANCED_TITLE" = "Advanced";