I couldn't believe this but white vinegar 50/50 mix with water - spray on to a microfiber cloth - not direct onto the glass - comes up a treat and those water Staines are gone - so in order - wash - glass cleaner - vinegar- glass cleaner then buff - sounds a lot but doesn't take long and actually works [emoji3][emoji106] Sent from my SM-G965F using Tapatalk