Merge "Bubble icon improvements"