diff --git a/src/plugins/beautifier/abstractsettings.cpp b/src/plugins/beautifier/abstractsettings.cpp
index 28610f1b3c9..908ce77ae98 100644
--- a/src/plugins/beautifier/abstractsettings.cpp
+++ b/src/plugins/beautifier/abstractsettings.cpp
@@ -8,6 +8,7 @@
 
 #include <coreplugin/icore.h>
 #include <coreplugin/idocument.h>
+
 #include <utils/algorithm.h>
 #include <utils/fileutils.h>
 #include <utils/genericconstants.h>
@@ -22,13 +23,10 @@
 
 using namespace Utils;
 
-namespace Beautifier {
-namespace Internal {
+namespace Beautifier::Internal {
 
-namespace {
 const char COMMAND[]        = "command";
 const char SUPPORTED_MIME[] = "supportedMime";
-}
 
 class VersionUpdater
 {
@@ -160,10 +158,10 @@ QString AbstractSettings::styleFileName(const QString &key) const
 
 FilePath AbstractSettings::command() const
 {
-    return FilePath::fromString(m_command);
+    return m_command;
 }
 
-void AbstractSettings::setCommand(const QString &cmd)
+void AbstractSettings::setCommand(const FilePath &cmd)
 {
     if (cmd == m_command)
         return;
@@ -248,7 +246,7 @@ void AbstractSettings::save()
         s->setValue(iSettings.key(), iSettings.value());
         ++iSettings;
     }
-    s->setValue(COMMAND, m_command);
+    s->setValue(COMMAND, m_command.toSettings());
     s->setValue(SUPPORTED_MIME, supportedMimeTypesAsString());
     s->endGroup();
     s->endGroup();
@@ -318,7 +316,7 @@ void AbstractSettings::read()
     const QStringList keys = s->allKeys();
     for (const QString &key : keys) {
         if (key == COMMAND)
-            setCommand(s->value(key).toString());
+            setCommand(FilePath::fromSettings(s->value(key)));
         else if (key == SUPPORTED_MIME)
             setSupportedMimeTypes(s->value(key).toString());
         else if (m_settings.contains(key))
@@ -413,5 +411,4 @@ void AbstractSettings::readStyles()
     }
 }
 
-} // namespace Internal
-} // namespace Beautifier
+} // Beautifier::Internal
diff --git a/src/plugins/beautifier/abstractsettings.h b/src/plugins/beautifier/abstractsettings.h
index 3f7fc979a3d..d386313e1b5 100644
--- a/src/plugins/beautifier/abstractsettings.h
+++ b/src/plugins/beautifier/abstractsettings.h
@@ -3,6 +3,8 @@
 
 #pragma once
 
+#include <utils/filepath.h>
+
 #include <QCoreApplication>
 #include <QDir>
 #include <QHash>
@@ -21,10 +23,8 @@ class QVersionNumber;
 QT_END_NAMESPACE
 
 namespace Core { class IDocument; }
-namespace Utils { class FilePath; }
 
-namespace Beautifier {
-namespace Internal {
+namespace Beautifier::Internal {
 
 class VersionUpdater;
 
@@ -53,7 +53,7 @@ public:
     virtual QString styleFileName(const QString &key) const;
 
     Utils::FilePath command() const;
-    void setCommand(const QString &cmd);
+    void setCommand(const Utils::FilePath &cmd);
     QVersionNumber version() const;
 
     QString supportedMimeTypesAsString() const;
@@ -82,11 +82,10 @@ private:
     std::unique_ptr<VersionUpdater> m_versionUpdater;
     QStringList m_stylesToRemove;
     QSet<QString> m_changedStyles;
-    QString m_command;
+    Utils::FilePath m_command;
     QHash<QString, int> m_options;
     QStringList m_docu;
     QStringList m_supportedMimeTypes;
 };
 
-} // namespace Internal
-} // namespace Beautifier
+} // Beautifier::Internal
diff --git a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp
index be80594269e..b37ef509d09 100644
--- a/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp
+++ b/src/plugins/beautifier/artisticstyle/artisticstyleoptionspage.cpp
@@ -112,7 +112,7 @@ ArtisticStyleOptionsPageWidget::ArtisticStyleOptionsPageWidget(ArtisticStyleSett
 
 void ArtisticStyleOptionsPageWidget::apply()
 {
-    m_settings->setCommand(m_command->filePath().toString());
+    m_settings->setCommand(m_command->filePath());
     m_settings->setSupportedMimeTypes(m_mime->text());
     m_settings->setUseOtherFiles(m_useOtherFiles->isChecked());
     m_settings->setUseSpecificConfigFile(m_useSpecificConfigFile->isChecked());
diff --git a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp
index 0c825b3e05d..be458a05e54 100644
--- a/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp
+++ b/src/plugins/beautifier/clangformat/clangformatoptionspage.cpp
@@ -123,7 +123,7 @@ ClangFormatOptionsPageWidget::ClangFormatOptionsPageWidget(ClangFormatSettings *
 
 void ClangFormatOptionsPageWidget::apply()
 {
-    m_settings->setCommand(m_command->filePath().toString());
+    m_settings->setCommand(m_command->filePath());
     m_settings->setSupportedMimeTypes(m_mime->text());
     m_settings->setUsePredefinedStyle(m_usePredefinedStyle->isChecked());
     m_settings->setPredefinedStyle(m_predefinedStyle->currentText());
diff --git a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
index dfcf365b8a4..9faa6f79888 100644
--- a/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
+++ b/src/plugins/beautifier/uncrustify/uncrustifyoptionspage.cpp
@@ -116,7 +116,7 @@ UncrustifyOptionsPageWidget::UncrustifyOptionsPageWidget(UncrustifySettings *set
 
 void UncrustifyOptionsPageWidget::apply()
 {
-    m_settings->setCommand(m_command->filePath().toString());
+    m_settings->setCommand(m_command->filePath());
     m_settings->setSupportedMimeTypes(m_mime->text());
     m_settings->setUseOtherFiles(m_useOtherFiles->isChecked());
     m_settings->setUseHomeFile(m_useHomeFile->isChecked());