To get rid of the separate search bar in Firefox, open up the toolbar customizer (right click on the toolbar and choose "customize.") Then just drag the search bar off the toolbar and back into the customize window. It works the same way as any other item on the toolbar as far as adding/removing goes.