Fix icon display (colour/grey icon in customise toolbar window)
Update todo