New icon and some more rebalance