diff --git a/icons/IconMode.cpp b/icons/IconMode.cpp
index b67fa803..880f3c3e 100644
--- a/icons/IconMode.cpp
+++ b/icons/IconMode.cpp
@@ -1,210 +1,218 @@
 /**************************************************************************
  * Copyright (C) 2009 by Ben Cooksley <bcooksley@kde.org>                 *
  *                                                                        *
  * This program is free software; you can redistribute it and/or          *
  * modify it under the terms of the GNU General Public License            *
  * as published by the Free Software Foundation; either version 2         *
  * of the License, or (at your option) any later version.                 *
  *                                                                        *
  * This program is distributed in the hope that it will be useful,        *
  * but WITHOUT ANY WARRANTY; without even the implied warranty of         *
  * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the          *
  * GNU General Public License for more details.                           *
  *                                                                        *
  * You should have received a copy of the GNU General Public License      *
  * along with this program; if not, write to the Free Software            *
  * Foundation, Inc., 51 Franklin Street, Fifth Floor, Boston, MA          *
  * 02110-1301, USA.                                                       *
 ***************************************************************************/
 
 #include "IconMode.h"
 #include "CategoryDrawer.h"
 #include "CategorizedView.h"
 
 #include "MenuItem.h"
 #include "MenuModel.h"
 #include "ModuleView.h"
 #include "MenuProxyModel.h"
 
 #include <QStackedWidget>
 
 #include <QAction>
 #include <KAboutData>
 #include <KStandardAction>
 #include <KFileItemDelegate>
 #include <KLocalizedString>
 
 K_PLUGIN_FACTORY( IconModeFactory, registerPlugin<IconMode>(); )
 
 class IconMode::Private {
 public:
     Private() : categoryDrawer( nullptr ),  categoryView( nullptr ), moduleView( nullptr ) {}
     virtual ~Private() {
         delete aboutIcon;
     }
 
     KCategoryDrawer * categoryDrawer;
     KCategorizedView * categoryView;
     QStackedWidget * mainWidget;
     MenuProxyModel * proxyModel;
     KAboutData * aboutIcon;
     ModuleView * moduleView;
     QAction * backAction;
 };
 
 IconMode::IconMode( QObject *parent, const QVariantList& )
     : BaseMode( parent )
     , d( new Private() )
 {
     d->aboutIcon = new KAboutData( QStringLiteral("IconView"), i18n( "Icon View" ),
                                  QStringLiteral("1.0"), i18n( "Provides a categorized icons view of control modules." ),
                                  KAboutLicense::GPL, i18n( "(c) 2009, Ben Cooksley" ) );
     d->aboutIcon->addAuthor( i18n( "Ben Cooksley" ), i18n( "Author" ), QStringLiteral("bcooksley@kde.org") );
     d->aboutIcon->addAuthor( i18n( "Mathias Soeken" ), i18n( "Developer" ), QStringLiteral("msoeken@informatik.uni-bremen.de") );
 
     d->backAction = KStandardAction::back( this, SLOT(backToOverview()), this );
     d->backAction->setText( i18n( "All Settings" ) );
     d->backAction->setToolTip( i18n("Keyboard Shortcut: %1", d->backAction->shortcut().toString( QKeySequence::NativeText )) );
     d->backAction->setEnabled( false );
     actionsList() << d->backAction;
 }
 
 IconMode::~IconMode()
 {
     delete d;
 }
 
 KAboutData * IconMode::aboutData()
 {
     return d->aboutIcon;
 }
 
 ModuleView * IconMode::moduleView() const
 {
     return d->moduleView;
 }
 
 QWidget * IconMode::mainWidget()
 {
     if( !d->categoryView ) {
         initWidget();
     }
     return d->mainWidget;
 }
 
 QList<QAbstractItemView*> IconMode::views() const
 {
     QList<QAbstractItemView*> list;
     list.append( d->categoryView );
     return list;
 }
 
 void IconMode::initEvent()
 {
     MenuModel * model = new MenuModel( rootItem(), this );
     foreach( MenuItem * child, rootItem()->children() ) {
         model->addException( child );
     }
 
     d->proxyModel = new MenuProxyModel( this );
     d->proxyModel->setCategorizedModel( true );
     d->proxyModel->setSourceModel( model );
     d->proxyModel->sort( 0 );
 
     d->mainWidget = new QStackedWidget();
     d->moduleView = new ModuleView( d->mainWidget );
     connect( d->moduleView, &ModuleView::moduleChanged, this, &IconMode::moduleLoaded );
     connect( d->moduleView, &ModuleView::closeRequest, this, &IconMode::backToOverview );
     d->categoryView = nullptr;
 }
 
 void IconMode::searchChanged( const QString& text )
 {
     d->proxyModel->setFilterRegExp( text );
     if ( d->categoryView ) {
         QAbstractItemModel *model = d->categoryView->model();
         const int column = d->categoryView->modelColumn();
         const QModelIndex root = d->categoryView->rootIndex();
         for ( int i = 0; i < model->rowCount(); ++i ) {
             const QModelIndex index = model->index( i, column, root );
             if ( model->flags( index ) & Qt::ItemIsEnabled ) {
                 d->categoryView->scrollTo( index );
                 break;
             }
         }
     }
 }
 
 void IconMode::changeModule( const QModelIndex& activeModule )
 {
     d->moduleView->closeModules();
     d->mainWidget->setCurrentWidget( d->moduleView );
+
+    // avoid double titles by setting the right face type before loading the module
+    if ( d->categoryView->model()->rowCount(activeModule) > 1 ) {
+        d->moduleView->setFaceType(KPageView::List);
+    } else {
+        d->moduleView->setFaceType(KPageView::Plain);
+    }
+
     d->moduleView->loadModule( activeModule );
 }
 
 void IconMode::moduleLoaded()
 {
     d->backAction->setEnabled( true );
     emit changeToolBarItems(BaseMode::NoItems);
 }
 
 void IconMode::backToOverview()
 {
     if( d->moduleView->resolveChanges() ) {
         d->mainWidget->setCurrentWidget( d->categoryView );
         d->moduleView->closeModules();
         d->backAction->setEnabled( false );
         emit changeToolBarItems( BaseMode::Search | BaseMode::Configure | BaseMode::Quit );
         emit viewChanged( false );
     }
 }
 
 void IconMode::initWidget()
 {
     // Create the widget
     d->categoryView = new CategorizedView( d->mainWidget );
     d->categoryDrawer = new CategoryDrawer(d->categoryView);
 
     d->categoryView->setSelectionMode( QAbstractItemView::SingleSelection );
     //PORT QT5 d->categoryView->setSpacing( KDialog::spacingHint() );
     d->categoryView->setCategoryDrawer( d->categoryDrawer );
     d->categoryView->setViewMode( QListView::IconMode );
     d->categoryView->setMouseTracking( true );
     d->categoryView->viewport()->setAttribute( Qt::WA_Hover );
 
     KFileItemDelegate *delegate = new KFileItemDelegate( d->categoryView );
     delegate->setWrapMode( QTextOption::WordWrap );
     d->categoryView->setItemDelegate( delegate );
 
     d->categoryView->setFrameShape( QFrame::NoFrame );
     d->categoryView->setModel( d->proxyModel );
     connect( d->categoryView, &QAbstractItemView::activated,
              this, &IconMode::changeModule );
 
     d->mainWidget->addWidget( d->categoryView );
     d->mainWidget->addWidget( d->moduleView );
     d->mainWidget->setCurrentWidget( d->categoryView );
     emit changeToolBarItems( BaseMode::Search | BaseMode::Configure | BaseMode::Quit );
     d->mainWidget->installEventFilter(this);
 }
 
 bool IconMode::eventFilter(QObject* watched, QEvent* event)
 {
     if (watched == d->mainWidget && event->type() == QEvent::Show) {
         emit changeToolBarItems( BaseMode::Search | BaseMode::Configure | BaseMode::Quit );
     }
     return BaseMode::eventFilter(watched, event);
 }
 
 void IconMode::leaveModuleView()
 {
     d->moduleView->closeModules(); // We have to force it here
     backToOverview();
 }
 
 void IconMode::giveFocus()
 {
     d->categoryView->setFocus();
 }
 
 #include "IconMode.moc"