diff --git a/src/bin/ui/ui.c b/src/bin/ui/ui.c
index dfb8c81..1898f0f 100644
--- a/src/bin/ui/ui.c
+++ b/src/bin/ui/ui.c
@@ -1560,7 +1560,7 @@ _menu_setup(Ui *ui)
 
    menu = elm_win_main_menu_get(ui->win);
    menu_it = elm_menu_item_add(menu, NULL, NULL, _("File"), NULL, NULL);
-   elm_menu_item_add(menu, menu_it, "exit", _("Quit"), _quit_cb, ui);
+   elm_menu_item_add(menu, menu_it, evisum_icon_path_get("exit"), _("Quit"), _quit_cb, ui);
    menu_it = elm_menu_item_add(menu, NULL, NULL, _("View"), NULL, NULL);
    elm_menu_item_add(menu, menu_it, NULL, _("CPU"), _menu_cpu_activity_clicked_cb, ui);
    elm_menu_item_add(menu, menu_it, NULL, _("Memory"),
diff --git a/src/bin/ui/ui_process_view.c b/src/bin/ui/ui_process_view.c
index a2116b5..9ea9315 100644
--- a/src/bin/ui/ui_process_view.c
+++ b/src/bin/ui/ui_process_view.c
@@ -633,7 +633,7 @@ _process_tab_add(Evas_Object *parent, Ui_Process *ui)
    evas_object_show(border);
 
    button = evisum_ui_button_add(parent, &ui->btn_stop, _("Stop"),
-                   _btn_stop_clicked_cb, ui);
+                   "stop",_btn_stop_clicked_cb, ui);
    ui->btn_stop = button;
    elm_object_content_set(border, button);
    elm_box_pack_end(hbox, border);
@@ -644,7 +644,7 @@ _process_tab_add(Evas_Object *parent, Ui_Process *ui)
    evas_object_show(border);
 
    button = evisum_ui_button_add(parent, &ui->btn_start, _("Start"),
-                   _btn_start_clicked_cb, ui);
+                   "start", _btn_start_clicked_cb, ui);
    ui->btn_start = button;
    elm_object_content_set(border, button);
    elm_box_pack_end(hbox, border);
@@ -656,7 +656,7 @@ _process_tab_add(Evas_Object *parent, Ui_Process *ui)
    evas_object_show(border);
 
    button = evisum_ui_button_add(parent, &ui->btn_kill, _("Kill"),
-                   _btn_kill_clicked_cb, ui);
+                   "kill", _btn_kill_clicked_cb, ui);
    ui->btn_kill = button;
    elm_object_content_set(border, button);
    elm_box_pack_end(hbox, border);
diff --git a/src/bin/ui/ui_util.c b/src/bin/ui/ui_util.c
index 18a3e3f..d42afcb 100644
--- a/src/bin/ui/ui_util.c
+++ b/src/bin/ui/ui_util.c
@@ -45,9 +45,9 @@ evisum_ui_tab_add(Evas_Object *parent, Evas_Object **alias, const char *text,
 
 Evas_Object *
 evisum_ui_button_add(Evas_Object *parent, Evas_Object **alias, const char *text,
-                Evas_Smart_Cb clicked_cb, void *data)
+                     const char *icon, Evas_Smart_Cb clicked_cb, void *data)
 {
-   Evas_Object *tbl, *rect, *button, *label;
+   Evas_Object *tbl, *rect, *button, *label, *hbx, *ic;
 
    tbl = elm_table_add(parent);
    evas_object_size_hint_weight_set(tbl, EXPAND, EXPAND);
@@ -66,13 +66,29 @@ evisum_ui_button_add(Evas_Object *parent, Evas_Object **alias, const char *text,
    evas_object_show(button);
    evas_object_smart_callback_add(button, "clicked", clicked_cb, data);
 
+   hbx = elm_box_add(parent);
+   elm_box_horizontal_set(hbx, EINA_TRUE);
+   evas_object_size_hint_weight_set(hbx, 0.0, EXPAND);
+   evas_object_size_hint_align_set(hbx, FILL, FILL);
+   evas_object_show(hbx);
+
+   ic = elm_icon_add(parent);
+   elm_icon_standard_set(ic, evisum_icon_path_get(icon));
+   evas_object_size_hint_weight_set(ic, EXPAND, EXPAND);
+   evas_object_size_hint_align_set(ic, FILL, FILL);
+   evas_object_show(ic);
+
+   elm_box_pack_end(hbx, ic);
+
    label = elm_label_add(parent);
-   evas_object_size_hint_weight_set(label, EXPAND, EXPAND);
+   evas_object_size_hint_weight_set(label, 1.0, EXPAND);
    evas_object_size_hint_align_set(label, FILL, FILL);
    evas_object_show(label);
    elm_object_text_set(label,
                    eina_slstr_printf("%s", text));
-   elm_layout_content_set(button, "elm.swallow.content", label);
+
+   elm_box_pack_end(hbx, label);
+   elm_layout_content_set(button, "elm.swallow.content", hbx);
 
    elm_table_pack(tbl, rect, 0, 0, 1, 1);
    elm_table_pack(tbl, button, 0, 0, 1, 1);
diff --git a/src/bin/ui/ui_util.h b/src/bin/ui/ui_util.h
index d614a5d..089fefb 100644
--- a/src/bin/ui/ui_util.h
+++ b/src/bin/ui/ui_util.h
@@ -20,11 +20,11 @@
 
 Evas_Object *
 evisum_ui_tab_add(Evas_Object *parent, Evas_Object **alias, const char *text,
-                Evas_Smart_Cb clicked_cb, void *data);
+                  Evas_Smart_Cb clicked_cb, void *data);
 
 Evas_Object *
 evisum_ui_button_add(Evas_Object *parent, Evas_Object **alias, const char *text,
-                Evas_Smart_Cb clicked_cb, void *data);
+                     const char *icon, Evas_Smart_Cb clicked_cb, void *data);
 
 const char *
 evisum_size_format(unsigned long long bytes);