v6 - Remove Border, Fix icon cycle for multiples