Fixed some component icon positioning