horizontal ui
fixes
icon change
merge