Resolve #3404515 "Improve icon selectionupload"

Set icon for all blocks, not just promoted blocks. Render 'Other' blocks just the same as 'Promoted' blocks in the sidebar