diff --git a/src/filewidgets/kdiroperator.h b/src/filewidgets/kdiroperator.h
--- a/src/filewidgets/kdiroperator.h
+++ b/src/filewidgets/kdiroperator.h
@@ -58,11 +58,11 @@
  * files.
  *
  * It supports different views, e.g. a detailed view (see KFileDetailView),
- * a simple icon view (see KFileIconView), a combination of two views,
+ * an icon view (see KFileIconView), a combination of two views,
  * separating directories and files ( KCombiView).
  *
  * Additionally, a preview view is available (see KFilePreview), which can
- * show either a simple or detailed view and additionally a preview widget
+ * show either an icon or detailed view and additionally a preview widget
  * (see setPreviewWidget()). KImageFilePreview is one implementation
  * of a preview widget, that displays previews for all supported filetypes
  * utilizing KIO::PreviewJob.
@@ -403,7 +403,8 @@
      * @li by type : sorts by type
      * @li descending : reverses the sort order
      * @li view menu : an ActionMenu containing all actions concerning the view
-     * @li short view : shows a simple fileview
+     * @li icon view : shows an icon fileview
+     * @li compact view : shows a compact fileview
      * @li detailed view : shows a detailed fileview (dates, permissions ,...)
      * @li show hidden : shows hidden files
      * @li preview  : shows a preview next to the fileview
@@ -465,7 +466,7 @@
     virtual void readConfig(const KConfigGroup &configGroup);
 
     /**
-     * Saves the current settings like sorting, simple or detailed view.
+     * Saves the current settings like sorting, current view.
      *
      * @see readConfig
      * @see setViewConfig
@@ -923,8 +924,8 @@
     Private *const d;
 
     Q_PRIVATE_SLOT(d, void _k_slotDetailedView())
-    Q_PRIVATE_SLOT(d, void _k_slotSimpleView())
-    Q_PRIVATE_SLOT(d, void _k_slotTreeView())
+    Q_PRIVATE_SLOT(d, void _k_slotIconView())
+    Q_PRIVATE_SLOT(d, void _k_slotCompactView())
     Q_PRIVATE_SLOT(d, void _k_slotDetailedTreeView())
     Q_PRIVATE_SLOT(d, void _k_slotToggleHidden(bool))
     Q_PRIVATE_SLOT(d, void _k_togglePreview(bool))
@@ -952,7 +953,6 @@
     Q_PRIVATE_SLOT(d, void _k_slotSplitterMoved(int, int))
     Q_PRIVATE_SLOT(d, void _k_assureVisibleSelection())
     Q_PRIVATE_SLOT(d, void _k_synchronizeSortingState(int, Qt::SortOrder))
-    Q_PRIVATE_SLOT(d, void _k_slotChangeDecorationPosition())
     Q_PRIVATE_SLOT(d, void _k_slotExpandToUrl(const QModelIndex &))
     Q_PRIVATE_SLOT(d, void _k_slotItemsChanged())
     Q_PRIVATE_SLOT(d, void _k_slotDirectoryCreated(const QUrl &))
diff --git a/src/filewidgets/kdiroperator.cpp b/src/filewidgets/kdiroperator.cpp
--- a/src/filewidgets/kdiroperator.cpp
+++ b/src/filewidgets/kdiroperator.cpp
@@ -44,7 +44,6 @@
 #include <QSplitter>
 #include <QWheelEvent>
 #include <QTimer>
-#include <QDebug>
 #include <QMimeDatabase>
 
 #include <kdirlister.h>
@@ -77,35 +76,53 @@
 class KDirOperatorIconView : public QListView
 {
     Q_OBJECT
+
 public:
-    KDirOperatorIconView(KDirOperator *dirOperator, QWidget *parent = nullptr);
-    virtual ~KDirOperatorIconView();
+    enum Kind {
+        Icon = 0,
+        Compact = 1
+    };
+    KDirOperatorIconView(QWidget *parent = nullptr, const Kind kind = Icon);
+    ~KDirOperatorIconView() override;
 
 protected:
     QStyleOptionViewItem viewOptions() const override;
     void dragEnterEvent(QDragEnterEvent *event) override;
     void mousePressEvent(QMouseEvent *event) override;
     void wheelEvent(QWheelEvent *event) override;
+    void resizeEvent(QResizeEvent *event) override;
+
+protected Q_SLOTS:
+    void updateLayout();
 
 private:
-    KDirOperator *ops;
+    Kind viewKind;
 };
 
-KDirOperatorIconView::KDirOperatorIconView(KDirOperator *dirOperator, QWidget *parent) :
-    QListView(parent),
-    ops(dirOperator)
+KDirOperatorIconView::KDirOperatorIconView(QWidget *parent, Kind kind) :
+    QListView(parent)
 {
+    viewKind = kind;
+
     setViewMode(QListView::IconMode);
-    setFlow(QListView::TopToBottom);
     setResizeMode(QListView::Adjust);
     setSpacing(0);
     setMovement(QListView::Static);
     setDragDropMode(QListView::DragOnly);
     setVerticalScrollMode(QListView::ScrollPerPixel);
     setHorizontalScrollMode(QListView::ScrollPerPixel);
     setEditTriggers(QAbstractItemView::NoEditTriggers);
     setWordWrap(true);
-    setIconSize(QSize(KIconLoader::SizeSmall, KIconLoader::SizeSmall));
+    if (viewKind == Icon) {
+        // Icon view
+        setFlow(QListView::LeftToRight);
+    } else {
+        // Compact View
+        setFlow(QListView::TopToBottom);
+        setIconSize(QSize(KIconLoader::SizeSmall, KIconLoader::SizeSmall));
+    }
+    // triggers a layout update when the icon size has changed
+    connect(this, &QAbstractItemView::iconSizeChanged, this, &KDirOperatorIconView::updateLayout);
 }
 
 KDirOperatorIconView::~KDirOperatorIconView()
@@ -116,10 +133,11 @@
 {
     QStyleOptionViewItem viewOptions = QListView::viewOptions();
     viewOptions.showDecorationSelected = true;
-    viewOptions.decorationPosition = ops->decorationPosition();
-    if (viewOptions.decorationPosition == QStyleOptionViewItem::Left) {
+    if (viewKind == Compact) {
+        viewOptions.decorationPosition = QStyleOptionViewItem::Left;
         viewOptions.displayAlignment = Qt::AlignLeft | Qt::AlignVCenter;
     } else {
+        viewOptions.decorationPosition = QStyleOptionViewItem::Top;
         viewOptions.displayAlignment = Qt::AlignCenter;
     }
 
@@ -161,6 +179,44 @@
     }
 }
 
+void KDirOperatorIconView::resizeEvent(QResizeEvent *event) {
+    Q_UNUSED(event);
+    updateLayout();
+}
+
+void KDirOperatorIconView::updateLayout() {
+    if (viewKind == Kind::Compact) {
+        setGridSize(QSize());
+        KFileItemDelegate *delegate = qobject_cast<KFileItemDelegate *>(itemDelegate());
+        if (delegate) {
+            delegate->setMaximumSize(QSize());
+        }
+    } else {
+        const QFontMetrics metrics(viewport()->font());
+
+        const int height = iconSize().height() + metrics.height() * 2.5;
+        const int minWidth = qMax(height, metrics.height() * 5);
+
+        const int scrollBarWidth = verticalScrollBar()->sizeHint().width();
+
+        // Subtract 1 px to prevent flickering when resizing the window
+        // For Oxygen a column is missing after showing the dialog without resizing it,
+        // therefore subtract 4 more (scaled) pixels
+        const int viewPortWidth = contentsRect().width() - scrollBarWidth - 1 - 4 * devicePixelRatioF();
+        const int itemsInRow = qMax(1, viewPortWidth / minWidth);
+        const int remainingWidth = viewPortWidth - (minWidth * itemsInRow);
+        const int width = minWidth + (remainingWidth / itemsInRow);
+
+        const QSize itemSize(width, height);
+
+        setGridSize(itemSize);
+        KFileItemDelegate *delegate = qobject_cast<KFileItemDelegate *>(itemDelegate());
+        if (delegate) {
+            delegate->setMaximumSize(itemSize);
+        }
+    }
+}
+
 void KDirOperator::keyPressEvent(QKeyEvent *e)
 {
     if (!(e->key() == Qt::Key_Return || e->key() == Qt::Key_Enter)) {
@@ -199,8 +255,8 @@
 
     // private slots
     void _k_slotDetailedView();
-    void _k_slotSimpleView();
-    void _k_slotTreeView();
+    void _k_slotIconView();
+    void _k_slotCompactView();
     void _k_slotDetailedTreeView();
     void _k_slotToggleHidden(bool);
     void _k_togglePreview(bool);
@@ -228,12 +284,10 @@
     void _k_slotSplitterMoved(int, int);
     void _k_assureVisibleSelection();
     void _k_synchronizeSortingState(int, Qt::SortOrder);
-    void _k_slotChangeDecorationPosition();
     void _k_slotExpandToUrl(const QModelIndex &);
     void _k_slotItemsChanged();
     void _k_slotDirectoryCreated(const QUrl &);
 
-    void updateListViewGrid();
     int iconSizeForViewType(QAbstractItemView *itemView) const;
 
     // private members
@@ -250,7 +304,6 @@
     KCompletion dirCompletion;
     bool completeListDirty;
     QDir::SortFlags sorting;
-    QStyleOptionViewItem::Position decorationPosition;
 
     QSplitter *splitter;
 
@@ -291,8 +344,6 @@
 
     bool isSaving;
 
-    KActionMenu *decorationMenu;
-    KToggleAction *leftAction;
     QList<QUrl> itemsToBeSetAsCurrent;
     bool shouldFetchForItems;
     InlinePreviewState inlinePreviewState;
@@ -302,7 +353,6 @@
 KDirOperator::Private::Private(KDirOperator *_parent) :
     parent(_parent),
     dirLister(nullptr),
-    decorationPosition(QStyleOptionViewItem::Left),
     splitter(nullptr),
     itemView(nullptr),
     dirModel(nullptr),
@@ -323,8 +373,6 @@
     showPreviews(false),
     iconsZoom(0),
     isSaving(false),
-    decorationMenu(nullptr),
-    leftAction(nullptr),
     shouldFetchForItems(false),
     inlinePreviewState(NotForced)
 {
@@ -369,7 +417,7 @@
     d->preview = nullptr;
 
     d->mode = KFile::File;
-    d->viewKind = KFile::Simple;
+    d->viewKind = KFile::Icon;
 
     if (_url.isEmpty()) { // no dir specified -> current dir
         QString strPath = QDir::currentPath();
@@ -593,24 +641,24 @@
 
 KFile::FileView KDirOperator::Private::allViews()
 {
-    return static_cast<KFile::FileView>(KFile::Simple | KFile::Detail | KFile::Tree | KFile::DetailTree);
+    return static_cast<KFile::FileView>(KFile::Icon | KFile::Detail | KFile::Compact | KFile::DetailTree);
 }
 
 void KDirOperator::Private::_k_slotDetailedView()
 {
     KFile::FileView view = static_cast<KFile::FileView>((viewKind & ~allViews()) | KFile::Detail);
     parent->setView(view);
 }
 
-void KDirOperator::Private::_k_slotSimpleView()
+void KDirOperator::Private::_k_slotIconView()
 {
-    KFile::FileView view = static_cast<KFile::FileView>((viewKind & ~allViews()) | KFile::Simple);
+    KFile::FileView view = static_cast<KFile::FileView>((viewKind & ~allViews()) | KFile::Icon);
     parent->setView(view);
 }
 
-void KDirOperator::Private::_k_slotTreeView()
+void KDirOperator::Private::_k_slotCompactView()
 {
-    KFile::FileView view = static_cast<KFile::FileView>((viewKind & ~allViews()) | KFile::Tree);
+    KFile::FileView view = static_cast<KFile::FileView>((viewKind & ~allViews()) | KFile::Compact);
     parent->setView(view);
 }
 
@@ -920,7 +968,6 @@
     const int maxSize = KIconLoader::SizeEnormous - KIconLoader::SizeSmall;
     const int val = (maxSize * value / 100) + KIconLoader::SizeSmall;
     d->itemView->setIconSize(QSize(val, val));
-    d->updateListViewGrid();
     d->previewGenerator->updatePreviews();
 
     emit currentIconSizeChanged(value);
@@ -1525,12 +1572,14 @@
 QAbstractItemView *KDirOperator::createView(QWidget *parent, KFile::FileView viewKind)
 {
     QAbstractItemView *itemView = nullptr;
-    if (KFile::isDetailView(viewKind) || KFile::isTreeView(viewKind) || KFile::isDetailTreeView(viewKind)) {
+    if (KFile::isDetailView(viewKind) || KFile::isDetailTreeView(viewKind)) {
         KDirOperatorDetailView *detailView = new KDirOperatorDetailView(parent);
         detailView->setViewMode(viewKind);
         itemView = detailView;
+    } else if (KFile::isCompactView(viewKind)) {
+        itemView = new KDirOperatorIconView(parent, KDirOperatorIconView::Kind::Compact);
     } else {
-        itemView = new KDirOperatorIconView(this, parent);
+        itemView = new KDirOperatorIconView(parent);
     }
 
     return itemView;
@@ -1564,12 +1613,12 @@
     if (viewKind == KFile::Default) {
         if (KFile::isDetailView((KFile::FileView)d->defaultView)) {
             viewKind = KFile::Detail;
-        } else if (KFile::isTreeView((KFile::FileView)d->defaultView)) {
-            viewKind = KFile::Tree;
+        } else if (KFile::isCompactView((KFile::FileView)d->defaultView)) {
+            viewKind = KFile::Compact;
         } else if (KFile::isDetailTreeView((KFile::FileView)d->defaultView)) {
             viewKind = KFile::DetailTree;
         } else {
-            viewKind = KFile::Simple;
+            viewKind = KFile::Icon;
         }
 
         const KFile::FileView defaultViewKind = static_cast<KFile::FileView>(d->defaultView);
@@ -1701,10 +1750,6 @@
             SIGNAL(selectionChanged(QItemSelection,QItemSelection)),
             this, SLOT(_k_slotSelectionChanged()));
 
-    // if we cannot cast it to a QListView, disable the "Icon Position" menu. Note that this check
-    // needs to be done here, and not in createView, since we can be set an external view
-    d->decorationMenu->setEnabled(qobject_cast<QListView *>(d->itemView));
-
     d->shouldFetchForItems = qobject_cast<QTreeView *>(view);
     if (d->shouldFetchForItems) {
         connect(d->dirModel, SIGNAL(expand(QModelIndex)), this, SLOT(_k_slotExpandToUrl(QModelIndex)));
@@ -1721,9 +1766,6 @@
     d->previewGenerator->setPreviewShown(previewShown);
     d->actionCollection->action(QStringLiteral("inline preview"))->setChecked(previewShown);
 
-    // ensure we change everything needed
-    d->_k_slotChangeDecorationPosition();
-
     emit viewChanged(view);
 
     const int zoom = previewForcedToTrue ? (KIconLoader::SizeHuge - KIconLoader::SizeSmall + 1) * 100 / maxSize : d->iconSizeForViewType(view);
@@ -2000,48 +2042,30 @@
     d->actionCollection->addAction(QStringLiteral("dirs first"), dirsFirstAction);
     connect(dirsFirstAction, SIGNAL(triggered(bool)), this, SLOT(_k_slotToggleDirsFirst()));
 
-    d->decorationMenu = new KActionMenu(i18n("Icon Position"), this);
-    d->actionCollection->addAction(QStringLiteral("decoration menu"), d->decorationMenu);
-
-    d->leftAction = new KToggleAction(i18n("Next to File Name"), this);
-    d->actionCollection->addAction(QStringLiteral("decorationAtLeft"), d->leftAction);
-    connect(d->leftAction, SIGNAL(triggered(bool)), this, SLOT(_k_slotChangeDecorationPosition()));
-
-    KToggleAction *topAction = new KToggleAction(i18n("Above File Name"), this);
-    d->actionCollection->addAction(QStringLiteral("decorationAtTop"), topAction);
-    connect(topAction, SIGNAL(triggered(bool)), this, SLOT(_k_slotChangeDecorationPosition()));
+    KToggleAction *iconAction = new KToggleAction(i18n("Icon view"), this);
+    d->actionCollection->addAction(QStringLiteral("icon view"),  iconAction);
+    iconAction->setIcon(QIcon::fromTheme(QStringLiteral("view-list-icons")));
+    connect(iconAction, SIGNAL(triggered()), SLOT(_k_slotIconView()));
 
-    d->decorationMenu->addAction(d->leftAction);
-    d->decorationMenu->addAction(topAction);
-
-    QActionGroup *decorationGroup = new QActionGroup(this);
-    d->leftAction->setActionGroup(decorationGroup);
-    topAction->setActionGroup(decorationGroup);
-
-    KToggleAction *shortAction = new KToggleAction(i18n("Short View"), this);
-    d->actionCollection->addAction(QStringLiteral("short view"),  shortAction);
-    shortAction->setIcon(QIcon::fromTheme(QStringLiteral("view-list-icons")));
-    connect(shortAction, SIGNAL(triggered()), SLOT(_k_slotSimpleView()));
+    KToggleAction *compactAction = new KToggleAction(i18n("Compact View"), this);
+    d->actionCollection->addAction(QStringLiteral("compact view"), compactAction);
+    compactAction->setIcon(QIcon::fromTheme(QStringLiteral("view-list-details")));
+    connect(compactAction, SIGNAL(triggered()), SLOT(_k_slotCompactView()));
 
     KToggleAction *detailedAction = new KToggleAction(i18n("Detailed View"), this);
     d->actionCollection->addAction(QStringLiteral("detailed view"), detailedAction);
     detailedAction->setIcon(QIcon::fromTheme(QStringLiteral("view-list-details")));
     connect(detailedAction, SIGNAL(triggered()), SLOT(_k_slotDetailedView()));
 
-    KToggleAction *treeAction = new KToggleAction(i18n("Tree View"), this);
-    d->actionCollection->addAction(QStringLiteral("tree view"), treeAction);
-    treeAction->setIcon(QIcon::fromTheme(QStringLiteral("view-list-tree")));
-    connect(treeAction, SIGNAL(triggered()), SLOT(_k_slotTreeView()));
-
     KToggleAction *detailedTreeAction = new KToggleAction(i18n("Detailed Tree View"), this);
     d->actionCollection->addAction(QStringLiteral("detailed tree view"), detailedTreeAction);
     detailedTreeAction->setIcon(QIcon::fromTheme(QStringLiteral("view-list-tree")));
     connect(detailedTreeAction, SIGNAL(triggered()), SLOT(_k_slotDetailedTreeView()));
 
     QActionGroup *viewGroup = new QActionGroup(this);
-    shortAction->setActionGroup(viewGroup);
+    iconAction->setActionGroup(viewGroup);
     detailedAction->setActionGroup(viewGroup);
-    treeAction->setActionGroup(viewGroup);
+    compactAction->setActionGroup(viewGroup);
     detailedTreeAction->setActionGroup(viewGroup);
 
     KToggleAction *showHiddenAction = new KToggleAction(i18n("Show Hidden Files"), this);
@@ -2075,10 +2099,9 @@
     // the view menu actions
     KActionMenu *viewMenu = new KActionMenu(i18n("&View"), this);
     d->actionCollection->addAction(QStringLiteral("view menu"), viewMenu);
-    viewMenu->addAction(shortAction);
+    viewMenu->addAction(iconAction);
+    viewMenu->addAction(compactAction);
     viewMenu->addAction(detailedAction);
-    // Comment following lines to hide the extra two modes
-    viewMenu->addAction(treeAction);
     viewMenu->addAction(detailedTreeAction);
     // TODO: QAbstractItemView does not offer an action collection. Provide
     // an interface to add a custom action collection.
@@ -2177,24 +2200,24 @@
     //separateDirs->setChecked(KFile::isSeparateDirs(fv) &&
     //                         separateDirs->isEnabled());
 
-    d->actionCollection->action(QStringLiteral("short view"))->setChecked(KFile::isSimpleView(fv));
+    d->actionCollection->action(QStringLiteral("icon view"))->setChecked(KFile::isIconView(fv));
+    d->actionCollection->action(QStringLiteral("compact view"))->setChecked(KFile::isCompactView(fv));
     d->actionCollection->action(QStringLiteral("detailed view"))->setChecked(KFile::isDetailView(fv));
-    d->actionCollection->action(QStringLiteral("tree view"))->setChecked(KFile::isTreeView(fv));
     d->actionCollection->action(QStringLiteral("detailed tree view"))->setChecked(KFile::isDetailTreeView(fv));
 }
 
 void KDirOperator::readConfig(const KConfigGroup &configGroup)
 {
     d->defaultView = 0;
-    QString viewStyle = configGroup.readEntry("View Style", "DetailTree");
+    QString viewStyle = configGroup.readEntry("View Style", "Icon");
     if (viewStyle == QLatin1String("Detail")) {
         d->defaultView |= KFile::Detail;
-    } else if (viewStyle == QLatin1String("Tree")) {
-        d->defaultView |= KFile::Tree;
+    } else if (viewStyle == QLatin1String("Compact")) {
+        d->defaultView |= KFile::Compact;
     } else if (viewStyle == QLatin1String("DetailTree")) {
         d->defaultView |= KFile::DetailTree;
     } else {
-        d->defaultView |= KFile::Simple;
+        d->defaultView |= KFile::Icon;
     }
     //if (configGroup.readEntry(QLatin1String("Separate Directories"),
     //                          DefaultMixDirsAndFiles)) {
@@ -2236,8 +2259,6 @@
     if (d->inlinePreviewState == Private::NotForced) {
         d->showPreviews = configGroup.readEntry(QStringLiteral("Show Inline Previews"), true);
     }
-    QStyleOptionViewItem::Position pos = (QStyleOptionViewItem::Position) configGroup.readEntry(QStringLiteral("Decoration position"), (int) QStyleOptionViewItem::Left);
-    setDecorationPosition(pos);
 }
 
 void KDirOperator::writeConfig(KConfigGroup &configGroup)
@@ -2288,10 +2309,10 @@
     QString style;
     if (KFile::isDetailView(fv)) {
         style = QStringLiteral("Detail");
-    } else if (KFile::isSimpleView(fv)) {
-        style = QStringLiteral("Simple");
-    } else if (KFile::isTreeView(fv)) {
-        style = QStringLiteral("Tree");
+    } else if (KFile::isIconView(fv)) {
+        style = QStringLiteral("Icon");
+    } else if (KFile::isCompactView(fv)) {
+        style = QStringLiteral("Compact");
     } else if (KFile::isDetailTreeView(fv)) {
         style = QStringLiteral("DetailTree");
     }
@@ -2305,8 +2326,6 @@
             configGroup.writeEntry(QStringLiteral("detailedViewIconSize"), d->iconsZoom);
         }
     }
-
-    configGroup.writeEntry(QStringLiteral("Decoration position"), (int) d->decorationPosition);
 }
 
 void KDirOperator::resizeEvent(QResizeEvent *)
@@ -2334,8 +2353,6 @@
         // might be reparented into a statusbar
         d->progressBar->move(2, height() - d->progressBar->height() - 2);
     }
-
-    d->updateListViewGrid();
 }
 
 void KDirOperator::setOnlyDoubleClickSelectsFiles(bool enable)
@@ -2574,33 +2591,6 @@
     QMetaObject::invokeMethod(parent, "_k_assureVisibleSelection", Qt::QueuedConnection);
 }
 
-void KDirOperator::Private::_k_slotChangeDecorationPosition()
-{
-    if (!itemView) {
-        return;
-    }
-
-    QListView *view = qobject_cast<QListView *>(itemView);
-
-    if (!view) {
-        return;
-    }
-
-    const bool leftChecked = actionCollection->action(QStringLiteral("decorationAtLeft"))->isChecked();
-
-    if (leftChecked) {
-        decorationPosition = QStyleOptionViewItem::Left;
-        view->setFlow(QListView::TopToBottom);
-    } else {
-        decorationPosition = QStyleOptionViewItem::Top;
-        view->setFlow(QListView::LeftToRight);
-    }
-
-    updateListViewGrid();
-
-    itemView->update();
-}
-
 void KDirOperator::Private::_k_slotExpandToUrl(const QModelIndex &index)
 {
     QTreeView *treeView = qobject_cast<QTreeView *>(itemView);
@@ -2648,52 +2638,6 @@
     completeListDirty = true;
 }
 
-void KDirOperator::Private::updateListViewGrid()
-{
-    if (!itemView) {
-        return;
-    }
-
-    QListView *view = qobject_cast<QListView *>(itemView);
-
-    if (!view) {
-        return;
-    }
-
-    const bool leftChecked = actionCollection->action(QStringLiteral("decorationAtLeft"))->isChecked();
-
-    if (leftChecked) {
-        view->setGridSize(QSize());
-        KFileItemDelegate *delegate = qobject_cast<KFileItemDelegate *>(view->itemDelegate());
-        if (delegate) {
-            delegate->setMaximumSize(QSize());
-        }
-    } else {
-        const QFontMetrics metrics(itemView->viewport()->font());
-
-        const int height = itemView->iconSize().height() + metrics.height() * 2.5;
-        const int minWidth = qMax(height, metrics.height() * 5);
-
-        const int scrollBarWidth = itemView->verticalScrollBar()->sizeHint().width();
-
-        // Subtract 1 px to prevent flickering when resizing the window
-        // For Oxygen a column is missing after showing the dialog without resizing it,
-        // therefore subtract 4 more (scaled) pixels
-        const int viewPortWidth = itemView->contentsRect().width() - scrollBarWidth - 1 - 4 * itemView->devicePixelRatioF();
-        const int itemsInRow = qMax(1, viewPortWidth / minWidth);
-        const int remainingWidth = viewPortWidth - (minWidth * itemsInRow);
-        const int width = minWidth + (remainingWidth / itemsInRow);
-        
-        const QSize itemSize(width, height);
-
-        view->setGridSize(itemSize);
-        KFileItemDelegate *delegate = qobject_cast<KFileItemDelegate *>(view->itemDelegate());
-        if (delegate) {
-            delegate->setMaximumSize(itemSize);
-        }
-    }
-}
-
 int KDirOperator::Private::iconSizeForViewType(QAbstractItemView *itemView) const
 {
     if (!itemView || !configGroup) {
@@ -2728,19 +2672,6 @@
     return d->actionCollection->action(QStringLiteral("show hidden"))->isChecked();
 }
 
-QStyleOptionViewItem::Position KDirOperator::decorationPosition() const
-{
-    return d->decorationPosition;
-}
-
-void KDirOperator::setDecorationPosition(QStyleOptionViewItem::Position position)
-{
-    d->decorationPosition = position;
-    const bool decorationAtLeft = d->decorationPosition == QStyleOptionViewItem::Left;
-    d->actionCollection->action(QStringLiteral("decorationAtLeft"))->setChecked(decorationAtLeft);
-    d->actionCollection->action(QStringLiteral("decorationAtTop"))->setChecked(!decorationAtLeft);
-}
-
 bool KDirOperator::Private::isReadable(const QUrl &url)
 {
     if (!url.isLocalFile()) {
diff --git a/src/filewidgets/kdiroperatordetailview.cpp b/src/filewidgets/kdiroperatordetailview.cpp
--- a/src/filewidgets/kdiroperatordetailview.cpp
+++ b/src/filewidgets/kdiroperatordetailview.cpp
@@ -57,10 +57,6 @@
     if (KFile::isDetailView(viewMode)) {
         m_hideDetailColumns = false;
         setAlternatingRowColors(true);
-    } else if (KFile::isTreeView(viewMode)) {
-        m_hideDetailColumns = true;
-        setAlternatingRowColors(false);
-        tree = true;
     } else if (KFile::isDetailTreeView(viewMode)) {
         m_hideDetailColumns = false;
         setAlternatingRowColors(true);
diff --git a/src/widgets/kfile.h b/src/widgets/kfile.h
--- a/src/widgets/kfile.h
+++ b/src/widgets/kfile.h
@@ -55,12 +55,12 @@
 
     enum FileView {
         Default         = 0,
-        Simple          = 1,
+        Icon            = 1,
         Detail          = 2,
         SeparateDirs    = 4,
         PreviewContents = 8,
         PreviewInfo     = 16,
-        Tree            = 32,
+        Compact         = 32,
         DetailTree      = 64,
         FileViewMax     = 65536
     };
@@ -93,7 +93,7 @@
     // view specific
     static bool isDefaultView(const FileView &view);
 
-    static bool isSimpleView(const FileView &view);
+    static bool isIconView(const FileView &view);
 
     static bool isDetailView(const FileView &view);
 
@@ -103,7 +103,7 @@
 
     static bool isPreviewInfo(const FileView &view);
 
-    static bool isTreeView(const FileView &view);
+    static bool isCompactView(const FileView &view);
 
     static bool isDetailTreeView(const FileView &view);
 
diff --git a/src/widgets/kfile.cpp b/src/widgets/kfile.cpp
--- a/src/widgets/kfile.cpp
+++ b/src/widgets/kfile.cpp
@@ -55,9 +55,9 @@
     return (view & Default) == Default;
 }
 
-bool KFile::isSimpleView(const FileView &view)
+bool KFile::isIconView(const FileView &view)
 {
-    return (view & Simple) == Simple;
+    return (view & Icon) == Icon;
 }
 
 bool KFile::isDetailView(const FileView &view)
@@ -80,9 +80,9 @@
     return (view & PreviewInfo) == PreviewInfo;
 }
 
-bool KFile::isTreeView(const FileView &view)
+bool KFile::isCompactView(const FileView &view)
 {
-    return (view & Tree) == Tree;
+    return (view & Compact) == Compact;
 }
 
 bool KFile::isDetailTreeView(const FileView &view)