Minor refactoring + bug fix

Icon now greys out properly