Merge "Patch the dark theme missed bar and icons"