Revert "Merge branch 'temp1'"

This reverts commit 7e60f9110b5ffe91f9c29268f2b87596d07f6249, reversing
changes made to 0c255204c3fbe56453abdb00665c924e2563a891.
add icons