Moved edit icon to more reasonable place