diff --git a/clients/oxygen/config/oxygenconfig.cpp b/clients/oxygen/config/oxygenconfig.cpp
index ff42989151..35bb488f5c 100644
--- a/clients/oxygen/config/oxygenconfig.cpp
+++ b/clients/oxygen/config/oxygenconfig.cpp
@@ -39,11 +39,8 @@
 #include <QtDBus/QDBusConnection>
 #include <QtDBus/QDBusMessage>
 
-#include <KAboutData>
-#include <KAboutApplicationDialog>
 #include <KConfigGroup>
-#include <KGlobal>
-#include <KLocale>
+#include <KLocalizedString>
 
 //_______________________________________________________________________
 extern "C"
@@ -60,11 +57,11 @@ namespace Oxygen
         QObject( parent )
     {
 
-        // cataloh
-        KGlobal::locale()->insertCatalog("kwin_clients");
+        // catalog
+        KLocalizedString::insertCatalog( QStringLiteral( "kwin_clients" ) );
 
         // configuration
-        _configuration = KSharedConfig::openConfig( "oxygenrc" );
+        _configuration = KSharedConfig::openConfig( QStringLiteral( "oxygenrc" ) );
 
         _configWidget = new ConfigWidget( parent );
 
@@ -146,7 +143,7 @@ namespace Oxygen
         // sync configuration
         _configuration->sync();
 
-        QDBusMessage message( QDBusMessage::createSignal("/OxygenWindeco",  "org.kde.Oxygen.Style", "reparseConfiguration") );
+        QDBusMessage message( QDBusMessage::createSignal( QStringLiteral( "/OxygenWindeco" ),  QStringLiteral( "org.kde.Oxygen.Style" ), QStringLiteral( "reparseConfiguration") ) );
         QDBusConnection::sessionBus().send(message);
 
     }
diff --git a/clients/oxygen/config/oxygenconfigwidget.cpp b/clients/oxygen/config/oxygenconfigwidget.cpp
index e36212d55e..4391cacfc0 100644
--- a/clients/oxygen/config/oxygenconfigwidget.cpp
+++ b/clients/oxygen/config/oxygenconfigwidget.cpp
@@ -28,11 +28,12 @@
 
 #include <kdeversion.h>
 
+#include <QGroupBox>
+#include <QIcon>
 #include <QLabel>
 #include <QLayout>
-#include <QGroupBox>
+
 #include <KLocalizedString>
-#include <KTabWidget>
 
 namespace Oxygen
 {
@@ -59,7 +60,7 @@ namespace Oxygen
         _animationConfigWidget->installEventFilter( this );
 
         // expert mode
-        ui._expertModeButton->setIcon( KIcon("configure") );
+        ui._expertModeButton->setIcon( QIcon::fromTheme( QStringLiteral( "configure" ) ) );
         toggleExpertModeInternal( false );
 
         // connections
diff --git a/clients/oxygen/config/oxygenexceptionlistwidget.cpp b/clients/oxygen/config/oxygenexceptionlistwidget.cpp
index 3710ba2f97..19ee294607 100644
--- a/clients/oxygen/config/oxygenexceptionlistwidget.cpp
+++ b/clients/oxygen/config/oxygenexceptionlistwidget.cpp
@@ -28,6 +28,7 @@
 #include "oxygenexceptiondialog.h"
 
 #include <QPointer>
+#include <QIcon>
 #include <KLocalizedString>
 #include <KMessageBox>
 
@@ -52,12 +53,11 @@ namespace Oxygen
         ui.exceptionListView->sortByColumn( ExceptionModel::TYPE );
         ui.exceptionListView->setSizePolicy( QSizePolicy( QSizePolicy::MinimumExpanding, QSizePolicy::Ignored ) );
 
-        KIconLoader* icon_loader = KIconLoader::global();
-        ui.moveUpButton->setIcon( KIcon( "arrow-up", icon_loader ) );
-        ui.moveDownButton->setIcon( KIcon( "arrow-down", icon_loader ) );
-        ui.addButton->setIcon( KIcon( "list-add", icon_loader ) );
-        ui.removeButton->setIcon( KIcon( "list-remove", icon_loader ) );
-        ui.editButton->setIcon( KIcon( "edit-rename", icon_loader ) );
+        ui.moveUpButton->setIcon( QIcon::fromTheme( QStringLiteral( "arrow-up" ) ) );
+        ui.moveDownButton->setIcon( QIcon::fromTheme( QStringLiteral( "arrow-down" ) ) );
+        ui.addButton->setIcon( QIcon::fromTheme( QStringLiteral( "list-add" ) ) );
+        ui.removeButton->setIcon( QIcon::fromTheme( QStringLiteral( "list-remove" ) ) );
+        ui.editButton->setIcon( QIcon::fromTheme( QStringLiteral( "edit-rename" ) ) );
 
         connect( ui.addButton, SIGNAL(clicked()), SLOT(add()) );
         connect( ui.editButton, SIGNAL(clicked()), SLOT(edit()) );
diff --git a/clients/oxygen/config/oxygenexceptionmodel.cpp b/clients/oxygen/config/oxygenexceptionmodel.cpp
index 574d160e5e..374b134e88 100644
--- a/clients/oxygen/config/oxygenexceptionmodel.cpp
+++ b/clients/oxygen/config/oxygenexceptionmodel.cpp
@@ -31,7 +31,7 @@ namespace Oxygen
     //_______________________________________________
     const QString ExceptionModel::_columnTitles[ ExceptionModel::nColumns ] =
     {
-        "",
+        QStringLiteral( "" ),
         i18n("Exception Type"),
         i18n("Regular Expression")
     };