Add search icon and some random fixes