Revise & reorganize images & icon