Merge "Fixing issue where search icons were only loaded after binding instead of at creation."