added bydirection focus
reorganised theme icons