Flashlight icon colors
merging demoscreen battery color and properties
fixed merge and added battery color