Merge "Remove hardcoded color for settings dashboard"