diff --git a/ChangeLog b/ChangeLog
index a4a52646c8..d4682691d5 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -14,6 +14,7 @@ Bug fixes:
 - #6989 Fix client tray language switcher reverts to EN
 - #6993 Fix issues with prefences UI
 - #6992 UI issues and use cases
+- #7000 Additional UI tweaks
 ===========
 
 Enhancements:
diff --git a/src/gui/src/ClientConnection.cpp b/src/gui/src/ClientConnection.cpp
index 5305206456..6ec238666b 100644
--- a/src/gui/src/ClientConnection.cpp
+++ b/src/gui/src/ClientConnection.cpp
@@ -63,11 +63,11 @@ bool ClientConnection::checkMainWindow()
 
 QString ClientConnection::getMessage(const QString& line) const
 {
-    QString message(QObject::tr("We can’t connect to the server IP address.\nCheck your IP on your server and your firewall settings."));
+    QString message(QObject::tr("Connection failed.\nCheck the IP address on the server, your TLS and firewall settings."));
 
     if (line.contains("server already has a connected client with our name"))
     {
-        message = QObject::tr("Connection failed.\nYou can’t name 2 computers the same");
+        message = QObject::tr("Connection failed.\nYou can’t name 2 computers the same.");
     }
     else
     {
diff --git a/src/gui/src/MainWindow.cpp b/src/gui/src/MainWindow.cpp
index 4741a87b7d..86fcad5ae8 100644
--- a/src/gui/src/MainWindow.cpp
+++ b/src/gui/src/MainWindow.cpp
@@ -132,7 +132,7 @@ MainWindow::MainWindow (AppConfig& appConfig,
 
     updateScreenName();
     connect(m_AppConfig, SIGNAL(screenNameChanged()), this, SLOT(updateScreenName()));
-    m_pLabelIpAddresses->setText(tr("This computers IP addresses: %1").arg(getIPAddresses()));
+    m_pLabelIpAddresses->setText(tr("This computer's IP addresses: %1").arg(getIPAddresses()));
 
 #if defined(Q_OS_WIN)
     // ipc must always be enabled, so that we can disable command when switching to desktop mode.
@@ -1380,7 +1380,7 @@ void MainWindow::windowStateChanged()
 
 void MainWindow::updateScreenName()
 {
-    m_pLabelComputerName->setText(tr("This computers name: %1 (<a href=\"#\" style=\"text-decoration: none; color: #4285F4;\">Preferences</a>)").arg(appConfig().screenName()));
+    m_pLabelComputerName->setText(tr("This computer's name: %1 (<a href=\"#\" style=\"text-decoration: none; color: #4285F4;\">Preferences</a>)").arg(appConfig().screenName()));
     serverConfig().updateServerName();
 }
 
diff --git a/src/gui/src/MainWindowBase.ui b/src/gui/src/MainWindowBase.ui
index 9b6c5b4ad9..1332559d26 100644
--- a/src/gui/src/MainWindowBase.ui
+++ b/src/gui/src/MainWindowBase.ui
@@ -108,7 +108,7 @@
        </font>
       </property>
       <property name="text">
-       <string notr="true">This computers name:</string>
+       <string notr="true">This computer's name:</string>
       </property>
      </widget>
     </item>
@@ -131,7 +131,7 @@
     <item>
      <widget class="QLabel" name="m_pLabelIpAddresses">
       <property name="text">
-       <string notr="true">This computers IP addresses:</string>
+       <string notr="true">This computer's IP addresses:</string>
       </property>
      </widget>
     </item>
@@ -228,7 +228,7 @@ background-color: rgba(192,192,192, 0.1);
 }</string>
             </property>
             <property name="text">
-             <string>Use this computers keyboard and mouse 
+             <string>Use this computer's keyboard and mouse 
 (Make this computer the server).</string>
             </property>
            </widget>
diff --git a/src/gui/src/ServerConfigDialogBase.ui b/src/gui/src/ServerConfigDialogBase.ui
index 41ab40ddf6..067ef13c5a 100644
--- a/src/gui/src/ServerConfigDialogBase.ui
+++ b/src/gui/src/ServerConfigDialogBase.ui
@@ -33,7 +33,7 @@
      </property>
      <widget class="QWidget" name="m_pTabScreens">
       <attribute name="title">
-       <string>Screens and links</string>
+       <string>Computers</string>
       </attribute>
       <layout class="QVBoxLayout">
        <property name="leftMargin">
@@ -894,7 +894,7 @@
        </sizepolicy>
       </property>
       <attribute name="title">
-       <string>Advance config</string>
+       <string>Advanced config</string>
       </attribute>
       <layout class="QVBoxLayout" name="verticalLayout_2">
        <item>