--- a/QTfrontend/hwform.cpp	Sun Oct 02 12:42:16 2016 +0200
+++ b/QTfrontend/hwform.cpp	Sun Oct 02 15:15:39 2016 +0200
@@ -46,6 +46,8 @@
 #include <QPropertyAnimation>
 #include <QSettings>
 #include <QSortFilterProxyModel>
+#include <QIcon>
+#include <QImage>
 
 #if (QT_VERSION >= 0x040600)
 #include <QGraphicsEffect>
@@ -142,6 +144,18 @@
     SDLInteraction::instance().setMusicTrack("/Music/main_theme.ogg");
 
     this->setStyleSheet(styleSheet);
+
+
+    QIcon * hwIcon = new QIcon();
+    hwIcon->addFile(":/res/hh_small.png");
+    //hwIcon->addFile(":/res/hh25x25.png");
+    // crop-workaround for the fact that hh25x25.png is actually 25x35
+    QPixmap pm(":/res/hh25x25.png");
+    hwIcon->addPixmap(pm.copy(0,(pm.height()-25)/2,25,25));
+    hwIcon->addFile(":/res/teamicon.png");
+    hwIcon->addFile(":/res/teamicon2.png");
+
+    this->setWindowIcon(*hwIcon);
     ui.setupUi(this);
     setMinimumSize(760, 580);
     //setFocusPolicy(Qt::StrongFocus);

--- a/QTfrontend/ui/widget/hedgehogerWidget.cpp	Sun Oct 02 12:42:16 2016 +0200
+++ b/QTfrontend/ui/widget/hedgehogerWidget.cpp	Sun Oct 02 15:15:39 2016 +0200
@@ -83,7 +83,7 @@
 {
     Q_UNUSED(event);
 
-    if (this->width() >= 11 * numItems + 26)
+    if ((this->width() >= 11 * numItems + 26) || (numItems == 1))
         ItemNum::paintEvent(event);
     else
     {