diff --git a/application/controllers/NavigationController.php b/application/controllers/NavigationController.php
index b0babc3c3..305ae9042 100644
--- a/application/controllers/NavigationController.php
+++ b/application/controllers/NavigationController.php
@@ -113,7 +113,7 @@ class NavigationController extends Controller
     }
 
     /**
-     * Show the current user a list of his/her navigation items
+     * Show the current user a list of their navigation items
      */
     public function indexAction()
     {
diff --git a/modules/monitoring/library/Monitoring/Hook/HostActionsHook.php b/modules/monitoring/library/Monitoring/Hook/HostActionsHook.php
index def009074..b0678b918 100644
--- a/modules/monitoring/library/Monitoring/Hook/HostActionsHook.php
+++ b/modules/monitoring/library/Monitoring/Hook/HostActionsHook.php
@@ -34,7 +34,7 @@ abstract class HostActionsHook extends ObjectActionsHook
      * </code>
      *
      * One might also provide ssh:// or rdp:// urls if equipped with fitting
-     * (safe) URL handlers for his browser(s).
+     * (safe) URL handlers for their browser(s).
      *
      * TODO: I'd love to see some kind of a Link/LinkSet object implemented
      *       for this and similar hooks.
diff --git a/modules/monitoring/library/Monitoring/Hook/ServiceActionsHook.php b/modules/monitoring/library/Monitoring/Hook/ServiceActionsHook.php
index c6cf5f57c..6ba466884 100644
--- a/modules/monitoring/library/Monitoring/Hook/ServiceActionsHook.php
+++ b/modules/monitoring/library/Monitoring/Hook/ServiceActionsHook.php
@@ -34,7 +34,7 @@ abstract class ServiceActionsHook extends ObjectActionsHook
      * </code>
      *
      * One might also provide ssh:// or rdp:// urls if equipped with fitting
-     * (safe) URL handlers for his browser(s).
+     * (safe) URL handlers for their browser(s).
      *
      * TODO: I'd love to see some kind of a Link/LinkSet object implemented
      *       for this and similar hooks.
diff --git a/modules/setup/application/views/scripts/form/setup-welcome.phtml b/modules/setup/application/views/scripts/form/setup-welcome.phtml
index 1be68f3f6..c3b69e270 100644
--- a/modules/setup/application/views/scripts/form/setup-welcome.phtml
+++ b/modules/setup/application/views/scripts/form/setup-welcome.phtml
@@ -79,7 +79,7 @@ if (! (false === ($distro = Platform::getLinuxDistro(1)) || $distro === 'linux')
       <p><?=
         $this->translate(
           'To run this wizard a user needs to authenticate using a token which is usually'
-          . ' provided to him by an administrator who\'d followed the instructions below.'
+          . ' provided to them by an administrator who\'d followed the instructions below.'
       ); ?></p>
       <?php if (! $docker): ?>
       <p><?= $this->translate('In any case, make sure that all of the following applies to your environment:'); ?></p>
diff --git a/modules/setup/library/Setup/Steps/UserGroupStep.php b/modules/setup/library/Setup/Steps/UserGroupStep.php
index 4aab67690..932ef8128 100644
--- a/modules/setup/library/Setup/Steps/UserGroupStep.php
+++ b/modules/setup/library/Setup/Steps/UserGroupStep.php
@@ -128,7 +128,7 @@ class UserGroupStep extends Step
     public function getSummary()
     {
         if (! isset($this->data['groupConfig'])) {
-            return; // It's not necessary to show the user something he didn't configure..
+            return; // It's not necessary to show the user something they didn't configure..
         }
 
         $pageTitle = '<h2>' . mt('setup', 'User Groups', 'setup.page.title') . '</h2>';
diff --git a/test/php/library/Icinga/UserTest.php b/test/php/library/Icinga/UserTest.php
index a5f7ebdb1..8e5345c62 100644
--- a/test/php/library/Icinga/UserTest.php
+++ b/test/php/library/Icinga/UserTest.php
@@ -36,7 +36,7 @@ class UserTest extends BaseTestCase
         $this->assertEquals(
             new DateTimeZone($explicitTz),
             $user->getTimeZone(),
-            'User\'s timezone does not match the timezone set by himself'
+            'User\'s timezone does not match the timezone set by themself'
         );
     }