Icons positioning improved - still need some fixes