diff --git a/src/bin/e_widget_toolbar.c b/src/bin/e_widget_toolbar.c
index 14b0f2b5e..6fb78b129 100644
--- a/src/bin/e_widget_toolbar.c
+++ b/src/bin/e_widget_toolbar.c
@@ -146,8 +146,15 @@ e_widget_toolbar_item_append(Evas_Object *obj, Evas_Object *icon, const char *la
    edje_object_signal_callback_add(o, "e,action,click", "e",
                                    _e_wid_signal_cb1, it);
    edje_extern_object_min_size_set(icon, wd->icon_w, wd->icon_h);
-   edje_object_part_swallow(o, "e.swallow.icon", icon);
-   evas_object_show(icon);
+   if (icon)
+     {
+        edje_object_part_swallow(o, "e.swallow.icon", icon);
+        evas_object_show(icon);
+        edje_object_signal_emit(o, "e,icon,enabled", "e");
+     }
+   else
+     edje_object_signal_emit(o, "e,icon,disabled", "e");
+   edje_object_message_signal_process(o);
    edje_object_part_text_set(o, "e.text.label", label);
    edje_object_size_min_calc(o, &mw, &mh);
    e_widget_sub_object_add(obj, o);
diff --git a/src/bin/e_widget_toolbook.c b/src/bin/e_widget_toolbook.c
index 7ac88be92..3060cabd0 100644
--- a/src/bin/e_widget_toolbook.c
+++ b/src/bin/e_widget_toolbook.c
@@ -46,6 +46,7 @@ e_widget_toolbook_page_append(Evas_Object *toolbook, Evas_Object *icon, const ch
    wd = e_widget_data_get(toolbook);
    e_widget_toolbar_item_append(wd->o_bar, icon, label, _item_sel,
                                 toolbook, content);
+   e_widget_table_object_repack(wd->o_tb, wd->o_bar, 0, 0, 1, 1, 1, 1, 1, 0);
    e_widget_table_object_align_append(wd->o_tb, content, 0, 1, 1, 1,
                                       fill_w, fill_h, expand_w, expand_h,
                                       ax, ay);