Revert "some shit"

This reverts commit 56d10a8d30cf4569a248b84b0fee9634b0bedcb6.
Revert "refactor again ..."

This reverts commit 93852b2c94198d4a01f2c4667ec4e2a5c2a52584.
green icon working well, not leave sub