diff --git a/src/plugins/projectexplorer/images/compile_error.png b/src/plugins/projectexplorer/images/compile_error.png
index 51a2779fcea..bd63cc3e568 100644
Binary files a/src/plugins/projectexplorer/images/compile_error.png and b/src/plugins/projectexplorer/images/compile_error.png differ
diff --git a/src/plugins/projectexplorer/images/compile_warning.png b/src/plugins/projectexplorer/images/compile_warning.png
index a42077a82a1..f76393b5dae 100644
Binary files a/src/plugins/projectexplorer/images/compile_warning.png and b/src/plugins/projectexplorer/images/compile_warning.png differ
diff --git a/src/plugins/projectexplorer/projectexplorer.qrc b/src/plugins/projectexplorer/projectexplorer.qrc
index 1ac214079e3..d7057873954 100644
--- a/src/plugins/projectexplorer/projectexplorer.qrc
+++ b/src/plugins/projectexplorer/projectexplorer.qrc
@@ -5,9 +5,7 @@
         <file>images/clean.png</file>
         <file>images/clean_small.png</file>
         <file>images/closetab.png</file>
-        <file>images/compile_error.png</file>
         <file>images/compile_unspecified.png</file>
-        <file>images/compile_warning.png</file>
         <file>images/debugger_start.png</file>
         <file>images/debugger_start_small.png</file>
         <file>images/filtericon.png</file>
@@ -28,5 +26,7 @@
         <file>images/rightselection.png</file>
         <file>images/midselection.png</file>
         <file>images/targetremovebutton.png</file>
+        <file>images/compile_error.png</file>
+        <file>images/compile_warning.png</file>
     </qresource>
 </RCC>
diff --git a/src/plugins/projectexplorer/taskwindow.cpp b/src/plugins/projectexplorer/taskwindow.cpp
index 5dce13258fb..00e0982c2f1 100644
--- a/src/plugins/projectexplorer/taskwindow.cpp
+++ b/src/plugins/projectexplorer/taskwindow.cpp
@@ -48,6 +48,11 @@
 #include <QtGui/QStyledItemDelegate>
 #include <QtGui/QSortFilterProxyModel>
 
+namespace {
+    const int TASK_ICON_SIZE = 16;
+    const int TASK_ICON_MARGIN = 2;
+}
+
 namespace ProjectExplorer {
 namespace Internal {
 
@@ -769,6 +774,8 @@ QSize TaskDelegate::sizeHint(const QStyleOptionViewItem &option, const QModelInd
     } else {
         s.setHeight(fontHeight + 3);
     }
+    if (s.height() < TASK_ICON_SIZE + 2 * TASK_ICON_MARGIN)
+        s.setHeight(TASK_ICON_SIZE + 2 * TASK_ICON_MARGIN);
     return s;
 }
 
@@ -817,7 +824,7 @@ void TaskDelegate::paint(QPainter *painter, const QStyleOptionViewItem &option,
     TaskModel *model = static_cast<TaskFilterModel *>(view->model())->taskModel();
     TaskWindow::TaskType type = TaskWindow::TaskType(index.data(TaskModel::Type).toInt());
     QIcon icon = model->iconFor(type);
-    painter->drawPixmap(2, opt.rect.top() + 2, icon.pixmap(16, 16));
+    painter->drawPixmap(TASK_ICON_MARGIN, opt.rect.top() + TASK_ICON_MARGIN, icon.pixmap(TASK_ICON_SIZE, TASK_ICON_SIZE));
 
     int width = opt.rect.width() - model->sizeOfFile() - model->sizeOfLineNumber() - 12 - 22;
     if (!selected) {