Bug 796220 - Use the "X" + Action button pattern for Settings Panels in the Settings App

Bug [#796220](https://bugzilla.mozilla.org/show_bug.cgi?id=796220)
There are some string changes