diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java
index 052028b..6130574 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/CustomTaskListDecorationDrawer.java
@@ -114,7 +114,7 @@
 		int offsetX = 6;
 		int offsetY = (event.height / 2) - 5;
 		if (taskListView.synchronizationOverlaid) {
-			offsetX = event.x + 19 - platformSpecificSquish;
+			offsetX = event.x + 18 - platformSpecificSquish;
 			offsetY += 2;
 		}
 		if (element instanceof AbstractTaskContainer) {
@@ -124,6 +124,8 @@
 					int additionalSquish = 0;
 					if (platformSpecificSquish > 0 && taskListView.synchronizationOverlaid) {
 						additionalSquish = platformSpecificSquish + 3;
+					} else if (platformSpecificSquish >0) {
+						additionalSquish = platformSpecificSquish / 2;
 					}
 					if (taskListView.synchronizationOverlaid) {
 						image = TasksUiImages.getImage(TasksUiImages.OVERLAY_SYNCH_INCOMMING);
diff --git a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java
index 5d258d5..c9dbb2e 100644
--- a/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java
+++ b/org.eclipse.mylyn.tasks.ui/src/org/eclipse/mylyn/internal/tasks/ui/views/TaskActivityLabelProvider.java
@@ -53,7 +53,7 @@
 	public Image getColumnImage(Object element, int columnIndex) {
 		if (columnIndex == 0) {
 			if (element instanceof DateRangeContainer) {
-				return TasksUiImages.getImage(TasksUiImages.CALENDAR);
+				super.getImage((DateRangeContainer)element);
 			} else if (element instanceof DateRangeActivityDelegate) {
 				return super.getImage(((DateRangeActivityDelegate) element).getCorrespondingTask());
 			} else {
