1 files changed, 7 insertions, 2 deletions

diff --git a/korganizer/koagendaitem.cpp b/korganizer/koagendaitem.cpp
index c055eb8..9fe1be4 100644
--- a/korganizer/koagendaitem.cpp
+++ b/korganizer/koagendaitem.cpp
@@ -196,3 +196,6 @@ bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout)
     int xOff = 0;
-    int x = pos().x() +3; 
+    int x = pos().x();
+
+    if ( x < 0 ) x = 0;
+    x += 3; 
     int y;
@@ -216,3 +219,3 @@ bool KOAgendaItem::updateIcons(QPainter * p, bool horLayout)
     }
-    if (mIncidence->cancelled()) {
+    if (mIncidence->cancelled() &&  height() < 20 ) {
         int xpos = xOff*( 1 +AGENDA_ICON_SIZE )+x;
@@ -435,2 +438,4 @@ void KOAgendaItem::paintMe( bool selected, QPainter* paint )
         x = 3;
+        if ( !horLayout && addIcon )
+            x += AGENDA_ICON_SIZE+3;
         if ( w > parentWidget()->width() ){