Restore visual consistency with other device classes. Bug 7259219 Change-Id: I1ffc88654e2fc9781fd59c6cecca6d5614ca0663