Minor changes in MultiHorizontalToolbar and IconWithPanel

Unnecessary final.