active icon logic fix