diff --git a/client/ui/client_ui.go b/client/ui/client_ui.go
index 7d7f436f5..f05f5489d 100644
--- a/client/ui/client_ui.go
+++ b/client/ui/client_ui.go
@@ -157,20 +157,20 @@ func (s *serviceClient) onTrayReady() {
 
 	systray.AddSeparator()
 
-	s.mUp = systray.AddMenuItem("Up", "Up")
+	s.mUp = systray.AddMenuItem("Connect", "Connect")
 
-	s.mDown = systray.AddMenuItem("Down", "Down")
+	s.mDown = systray.AddMenuItem("Disconnect", "Disconnect")
 	s.mDown.Disable()
 
-	mURL := systray.AddMenuItem("Open UI", "wiretrustee website")
+	mURL := systray.AddMenuItem("Admin Panel", "Wiretrustee Admin Panel")
 
 	systray.AddSeparator()
 
-	mQuit := systray.AddMenuItem("Quit", "Quit the whole app")
+	mQuit := systray.AddMenuItem("Quit", "Quit the client app")
 
 	go func() {
 		for {
-		s.updateStatus()
+			s.updateStatus()
 			time.Sleep(time.Second * 3)
 		}
 	}()
diff --git a/client/ui/connected.ico b/client/ui/connected.ico
index 7ec2fb4f6..3dd598fa7 100644
Binary files a/client/ui/connected.ico and b/client/ui/connected.ico differ
diff --git a/client/ui/disconnected.ico b/client/ui/disconnected.ico
index 6f02f9ff5..2bab8a503 100644
Binary files a/client/ui/disconnected.ico and b/client/ui/disconnected.ico differ