Fixing highlighting/icon issues