diff --git a/kio/kfile/kfilewidget.cpp b/kio/kfile/kfilewidget.cpp
index b82cfd6d..2a36461f 100644
--- a/kio/kfile/kfilewidget.cpp
+++ b/kio/kfile/kfilewidget.cpp
@@ -1165,7 +1165,7 @@ void KFileWidgetPrivate::removeDummyHistoryEntry()
 void KFileWidgetPrivate::setLocationText(const KUrl& url)
 {
     if (!url.isEmpty()) {
-        QPixmap urlIcon = KIO::pixmapForUrl( url, KIconLoader::Small );
+        QPixmap urlIcon = KIO::pixmapForUrl(url, KIconLoader::Small);
         if (url.hasPath()) {
             if (!url.directory().isEmpty()) {
                 KUrl u(url);
@@ -1385,7 +1385,7 @@ void KFileWidgetPrivate::_k_urlEntered(const KUrl& url)
 
     bool blocked = locationEdit->blockSignals(true);
     if (keepLocation) {
-        locationEdit->changeUrl(0, KIcon(KMimeType::iconNameForUrl(filename)), filename);
+        locationEdit->changeUrl(0, KIcon(KIO::pixmapForUrl(KUrl(filename))), filename);
         locationEdit->lineEdit()->setModified(true);
     }
 
@@ -1487,7 +1487,11 @@ void KFileWidgetPrivate::_k_fileCompletion( const QString& match )
         return;
     }
 
-    setDummyHistoryEntry(locationEdit->currentText(), KIconLoader::global()->loadMimeTypeIcon( KMimeType::iconNameForUrl( match ), KIconLoader::Small), !locationEdit->currentText().isEmpty());
+    setDummyHistoryEntry(
+        locationEdit->currentText(),
+        KIO::pixmapForUrl(KUrl(match), KIconLoader::Small),
+        !locationEdit->currentText().isEmpty()
+    );
 }
 
 void KFileWidgetPrivate::_k_slotLocationChanged( const QString& text )
diff --git a/kio/kfile/kurlcombobox.cpp b/kio/kfile/kurlcombobox.cpp
index 886803f4..0a26f778 100644
--- a/kio/kfile/kurlcombobox.cpp
+++ b/kio/kfile/kurlcombobox.cpp
@@ -18,16 +18,17 @@
 
 #include "kurlcombobox.h"
 
-#include <QtCore/QDir>
-#include <QtGui/qevent.h>
-#include <QtGui/QDrag>
+#include <QDir>
+#include <QMouseEvent>
+#include <QDrag>
 
-#include <kdebug.h>
-#include <kglobalsettings.h>
-#include <kicon.h>
-#include <klocale.h>
-#include <kmimetype.h>
-#include <kiconloader.h>
+#include "kglobalsettings.h"
+#include "kicon.h"
+#include "klocale.h"
+#include "kmimetype.h"
+#include "kiconloader.h"
+#include "kio/global.h"
+#include "kdebug.h"
 
 class KUrlComboBox::KUrlComboBoxPrivate
 {
@@ -420,10 +421,10 @@ void KUrlComboBox::mouseMoveEvent(QMouseEvent *event)
 
 QIcon KUrlComboBox::KUrlComboBoxPrivate::getIcon( const KUrl& url ) const
 {
-    if (myMode == Directories)
+    if (myMode == Directories) {
         return dirIcon;
-    else
-        return KIcon(KMimeType::iconNameForUrl(url, 0));
+    }
+    return KIcon(KIO::pixmapForUrl(url));
 }
 
 
@@ -433,12 +434,11 @@ void KUrlComboBox::KUrlComboBoxPrivate::updateItem( const KUrlComboBoxPrivate::K
 {
     m_parent->setItemIcon(index,icon);
 
-    if ( m_parent->isEditable() ) {
+    if (m_parent->isEditable()) {
         m_parent->setItemText(index, item->url.pathOrUrl(myMode == Directories
                                                          ? KUrl::AddTrailingSlash
                                                          : KUrl::RemoveTrailingSlash));
-    }
-    else {
+    } else {
         m_parent->setItemText(index,item->text);
     }
 }