Functioning Search, cleaned up icons