Merge "Patch dark theme for missed icons and bars"