various fix layout add icon