Fix some icons and markup on custom related widgets [story:44570747]