Minor changes in MultiHorizontalToolbar and IconWithPanel