Revert "Add HP indicator and description for controls"

This reverts commit 4682da10a0fb90076b2506e1edd44890604edf4f.
Revert "Revert "Add HP indicator and description for controls""

This reverts commit f2e5a98823dfbf5e906541fc9323d2ce45c7cf7c.