fix layout and new icons