All Indicator button state correctly rendered on theme filter change