new icons
merged
some fixing with login...