Revert "Bug 990028 - [Home2] App and Bookmark Icon Deletion r=me"

This reverts commit ca49e1f8d8c1feab8ae5dab1fd96eef38d77ea5f.
Revert "Bug 990028 - [Home2] App and Bookmark Icon Deletion follow-up r=me"

This reverts commit 4522835e89d8e1ef4bf99b9981e25980da147cf7.