Moved upload widget to main bar, and adjusted icons