Some re-arrangement and remove icon from hw button settings

Signed-off-by: Dragon <dragon7780@hotmail.nl>