Bug fix on the connection icon in the action bar and on the socket alarm system.more work needs to be done.

Code cleaning.