Fixing front icon issues