diff --git a/src/widget/properties/KexiObjectInfoWidget.cpp b/src/widget/properties/KexiObjectInfoWidget.cpp
index 18e10b30c..f1f375591 100644
--- a/src/widget/properties/KexiObjectInfoWidget.cpp
+++ b/src/widget/properties/KexiObjectInfoWidget.cpp
@@ -1,171 +1,172 @@
 /* This file is part of the KDE project
    Copyright (C) 2004-2016 Jarosław Staniek <staniek@kde.org>
 
    This program is free software; you can redistribute it and/or
    modify it under the terms of the GNU Library 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
    Library General Public License for more details.
 
    You should have received a copy of the GNU Library General Public License
    along with this program; see the file COPYING.  If not, write to
    the Free Software Foundation, Inc., 51 Franklin Street, Fifth Floor,
  * Boston, MA 02110-1301, USA.
 */
 
 #include "KexiObjectInfoWidget.h"
 #include "KexiPropertyPaneLineEdit.h"
 #include <KexiStyle.h>
 #include <kexiutils/utils.h>
 
 #include <KDbIdentifierValidator>
 
 #include <QCoreApplication>
 #include <QEvent>
 #include <QIcon>
 #include <QLabel>
 #include <QLineEdit>
 #include <QHBoxLayout>
 
 #include <KIconLoader>
 #include <KLocalizedString>
 #include <KMessageBox>
 
 class KexiObjectInfoWidget::Private
 {
 public:
     Private() : isObjectNameIdentifier(false), objectNameValidator(nullptr)
     , slotObjectNameEnterPressedEnabled(true) {}
     QString classIconName;
     QLabel *objectIconLabel;
     QLabel *objectClassLabel;
     KexiPropertyPaneLineEdit *objectNameBox;
     bool isObjectNameIdentifier;
     KDbIdentifierValidator *objectNameValidator;
     bool slotObjectNameEnterPressedEnabled;
 };
 
 KexiObjectInfoWidget::KexiObjectInfoWidget(QWidget* parent)
         : QWidget(parent)
         , d( new Private )
 {
     QWidget::setObjectName("KexiObjectInfoWidget");
     QHBoxLayout *hlyr = new QHBoxLayout(this);
     hlyr->setContentsMargins(0, 0, 0, 0);
     hlyr->setSpacing(0);
 
     const KexiStyle::PropertyPane &s = KexiStyle::propertyPane();
 
     hlyr->addSpacing(s.sectionTitleIndent);
     d->objectIconLabel = new QLabel;
     d->objectIconLabel->setSizePolicy(QSizePolicy::Fixed, QSizePolicy::Preferred);
     hlyr->addWidget(d->objectIconLabel, 3);
 
     d->objectClassLabel = new QLabel;
-    d->objectClassLabel->setSizePolicy(QSizePolicy::Maximum, QSizePolicy::Preferred);
+    d->objectClassLabel->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Preferred);
     d->objectClassLabel->setPalette(s.sectionTitlePalette(d->objectClassLabel->palette()));
     hlyr->addWidget(d->objectClassLabel, 0);
 
     hlyr->addSpacing(s.horizontalSpacingAfterLabel);
 
     d->objectNameBox = new KexiPropertyPaneLineEdit;
     connect(d->objectNameBox, &KexiPropertyPaneLineEdit::enterPressed, this, &KexiObjectInfoWidget::slotObjectNameEnterPressed);
     connect(d->objectNameBox, &KexiPropertyPaneLineEdit::focusOut, this, &KexiObjectInfoWidget::slotObjectNameEnterPressed);
     hlyr->addWidget(d->objectNameBox, 2);
     d->objectNameBox->setClearButtonEnabled(true);
     d->objectNameBox->setSizePolicy(QSizePolicy::Minimum, QSizePolicy::Fixed);
     d->objectClassLabel->setBuddy(d->objectNameBox);
 
     hlyr->addSpacing(s.margins.right());
 }
 
 KexiObjectInfoWidget::~KexiObjectInfoWidget()
 {
     delete d;
 }
 
 QString KexiObjectInfoWidget::objectClassIconName() const
 {
     return d->classIconName;
 }
 
 void KexiObjectInfoWidget::setObjectClassIconName(const QString &iconName)
 {
     const KexiStyle::PropertyPane &s = KexiStyle::propertyPane();
     d->classIconName = iconName;
-    if (d->classIconName.isEmpty()) {
+    QIcon icon(d->classIconName.isEmpty() ? QIcon() : s.icon(iconName));
+    if (icon.isNull()) {
         d->objectIconLabel->setFixedWidth(0);
         d->objectIconLabel->setPixmap(QPixmap());
     }
     else {
         d->objectIconLabel->setMaximumWidth(IconSize(KIconLoader::Small) + s.horizontalSpacingAfterIcon);
-        d->objectIconLabel->setPixmap(s.icon(iconName).pixmap(IconSize(KIconLoader::Small)));
+        d->objectIconLabel->setPixmap(icon.pixmap(IconSize(KIconLoader::Small)));
     }
 }
 
 QString KexiObjectInfoWidget::objectClassName() const
 {
     return d->objectClassLabel->text();
 }
 
 void KexiObjectInfoWidget::setObjectClassName(const QString& name)
 {
     d->objectClassLabel->setText(name);
 }
 
 QString KexiObjectInfoWidget::objectName() const
 {
     return d->objectNameBox->text();
 }
 
 void KexiObjectInfoWidget::setObjectVisible(bool set)
 {
     d->objectNameBox->setVisible(set);
 }
 
 void KexiObjectInfoWidget::setObjectName(const QString& name)
 {
     d->objectNameBox->setText(name);
     d->objectNameBox->end(false);
 }
 
 void KexiObjectInfoWidget::focusObjectNameBox()
 {
     d->objectNameBox->setFocus();
 }
 
 void KexiObjectInfoWidget::setObjectNameIsIdentifier(bool set)
 {
     if (d->isObjectNameIdentifier == set) {
         return;
     }
     if (set) {
         d->objectNameValidator = new KDbIdentifierValidator(this);
         d->objectNameBox->setValidator(d->objectNameValidator);
     } else {
         d->objectNameBox->setValidator(0);
         delete d->objectNameValidator;
         d->objectNameValidator = 0;
     }
 }
 
 bool KexiObjectInfoWidget::isObjectNameIdentifier() const
 {
     return d->isObjectNameIdentifier;
 }
 
 void KexiObjectInfoWidget::slotObjectNameEnterPressed()
 {
     emit objectNameChangeAccepted();
 }
 
 bool KexiObjectInfoWidget::checkObjectName()
 {
     const KDbValidator::Result result = d->objectNameValidator->check(
         QString(), d->objectNameBox->text(), nullptr, nullptr);
     return result == KDbValidator::Ok;
 }