Keep cellular type and signal strength icons separate

Rather than combine the cellular protocol and signal icons into a single icon (as in the icons mentioned in #118 (closed)) the connectivity status area should act more like the following.

Preference is still given to the currently connected protocol, it just so happens that Wi-Fi's protocol and signal strength icons are one and the same, cellular signal strength and protocol are separate due to the fact that there are many protocol icons. Trying to combine the two runs into legibility issues as the text/protocol indicator is small and it's a poor icon design choice as one icon would be trying to convey two things at once.