Fix icon change bug
Fix app theme and other small cosmetic fixes