diff --git a/infolog/inc/class.infolog_ui.inc.php b/infolog/inc/class.infolog_ui.inc.php
index 244d0d9838..d087304f62 100644
--- a/infolog/inc/class.infolog_ui.inc.php
+++ b/infolog/inc/class.infolog_ui.inc.php
@@ -918,14 +918,14 @@ class infolog_ui
 			),
 			'view' => array(
 				'caption' => 'View subs',
-				'icon' => 'view',
+				'icon' => 'egw_action/arrow_left',
 				'group' => $group,
 				'hint' => 'View all subs of this entry',
 				'enableClass' => 'rowHasSubs',
 			),
 			'parent' => array(
 				'caption' => 'View parent',
-				'icon' => 'parent',
+				'icon' => 'egw_action/arrow_up',
 				'group' => $group,
 				'hideOnDisabled' => true,
 				'hint' => 'View the parent of this entry and all his subs',
diff --git a/infolog/templates/default/app.css b/infolog/templates/default/app.css
index 824b5e70dd..5500df299d 100644
--- a/infolog/templates/default/app.css
+++ b/infolog/templates/default/app.css
@@ -18,4 +18,14 @@ table.fullWidth { width: 100%; }
 .noWrap { white-space: nowrap; }
 .user_filter select { width: 100px; }
 .inputFullWidth input { width: 100%; }
-.image16 img { height: 16px; }
\ No newline at end of file
+.image16 img { height: 16px; }
+tr.rowHasSubs > td:first-child {
+	background-image: url(../../../phpgwapi/templates/default/images/egw_action/arrow_left.png);
+	background-repeat: no-repeat;
+	background-position: 0px 11px;
+}
+tr.rowHasParent > td:first-child {
+	background-image: url(../../../phpgwapi/templates/default/images/egw_action/arrow_up.png);
+	background-repeat: no-repeat;
+	background-position: 0px 11px;
+}
diff --git a/phpgwapi/inc/class.common.inc.php b/phpgwapi/inc/class.common.inc.php
index 3195712d11..6a403a0a26 100644
--- a/phpgwapi/inc/class.common.inc.php
+++ b/phpgwapi/inc/class.common.inc.php
@@ -871,11 +871,19 @@ class common
 
 				foreach(scandir($dir) as $img)
 				{
-					if ($img[0] == '.' || !in_array($ext = self::get_extension($img, $name), $img_types) || empty($name)) continue;
+					if ($img[0] == '.') continue;
 
-					if (!isset($app_map[$name]) || array_search($ext, $img_types) < array_search(self::get_extension($app_map[$name]), $img_types))
+					unset($subdir);
+					foreach(is_dir($dir.'/'.$img) ? scandir($dir.'/'.($subdir=$img)) : (array) $img as $img)
 					{
-						$app_map[$name] = $imagedir.'/'.$img;
+						if (!in_array($ext = self::get_extension($img, $name), $img_types) || empty($name)) continue;
+
+						if (isset($subdir)) $name = $subdir.'/'.$name;
+
+						if (!isset($app_map[$name]) || array_search($ext, $img_types) < array_search(self::get_extension($app_map[$name]), $img_types))
+						{
+							$app_map[$name] = $imagedir.'/'.$name.'.'.$ext;
+						}
 					}
 				}
 			}
diff --git a/phpgwapi/templates/default/images/egw_action/arrow_left.png b/phpgwapi/templates/default/images/egw_action/arrow_left.png
new file mode 100644
index 0000000000..7c4afa7fe5
Binary files /dev/null and b/phpgwapi/templates/default/images/egw_action/arrow_left.png differ
diff --git a/phpgwapi/templates/default/images/egw_action/arrow_up.png b/phpgwapi/templates/default/images/egw_action/arrow_up.png
new file mode 100644
index 0000000000..7cf95b85dc
Binary files /dev/null and b/phpgwapi/templates/default/images/egw_action/arrow_up.png differ