diff --git a/src/modules/systray/e_mod_main.c b/src/modules/systray/e_mod_main.c
index f83624380..00e1d5087 100644
--- a/src/modules/systray/e_mod_main.c
+++ b/src/modules/systray/e_mod_main.c
@@ -324,7 +324,7 @@ _systray_icon_add(Instance *inst, const Ecore_X_Window win)
 {
    Ecore_X_Gravity gravity;
    Evas_Object *o;
-   Evas_Coord w, h;
+   int w, h, sz;
    Icon *icon;
 
    edje_object_part_geometry_get(inst->ui.gadget, _part_size,
@@ -334,6 +334,11 @@ _systray_icon_add(Instance *inst, const Ecore_X_Window win)
    else
      h = w;
 
+   /* assuming systray must be on a shelf here */
+   sz = MIN(inst->gcc->gadcon->shelf->w, inst->gcc->gadcon->shelf->h);
+   if ((w < 16) && (sz > 16))
+     w = h = sz - 5;
+
    w = h = e_util_icon_size_normalize(w);
 
    o = evas_object_rectangle_add(inst->evas);