Added new settings + shifts management + icons