Some improvement for battery and icon