diff --git a/data/themes/default/images.edc b/data/themes/default/images.edc
index 33146a9..cefac45 100644
--- a/data/themes/default/images.edc
+++ b/data/themes/default/images.edc
@@ -4,15 +4,27 @@ images {
    image: "panes_left_arrow.png" COMP;
    image: "panes_right_arrow.png" COMP;
    image: "panes_recover_arrow.png" COMP;
-   image: "hotkeys.png" COMP;
+   image: "hotkeys_open.png" COMP;
+   image: "hotkeys_close.png" COMP;
 }
 
-group { name: "hotkeys";
+group { name: "hotkeys_open";
    parts {
       part { name: "img";
          type: IMAGE;
          description { state: "default" 0.0;
-            image.normal: "hotkeys.png";
+            image.normal: "hotkeys_open.png";
+         }
+      }
+   }
+}
+
+group { name: "hotkeys_close";
+   parts {
+      part { name: "img";
+         type: IMAGE;
+         description { state: "default" 0.0;
+            image.normal: "hotkeys_close.png";
          }
       }
    }
diff --git a/data/themes/default/images/Makefile.am b/data/themes/default/images/Makefile.am
index 4d5c103..00c4877 100644
--- a/data/themes/default/images/Makefile.am
+++ b/data/themes/default/images/Makefile.am
@@ -59,5 +59,6 @@ EXTRA_DIST = \
    panes_left_arrow.png \
    panes_right_arrow.png \
    panes_recover_arrow.png \
-   hotkeys.png \
+   hotkeys_close.png \
+   hotkeys_open.png \
    pm_fill.png
diff --git a/data/themes/default/images/hotkeys.png b/data/themes/default/images/hotkeys_close.png
similarity index 100%
rename from data/themes/default/images/hotkeys.png
rename to data/themes/default/images/hotkeys_close.png
diff --git a/data/themes/default/images/hotkeys_open.png b/data/themes/default/images/hotkeys_open.png
new file mode 100644
index 0000000..625c9ed
Binary files /dev/null and b/data/themes/default/images/hotkeys_open.png differ
diff --git a/src/bin/panes.c b/src/bin/panes.c
index da653dc..7fd7785 100644
--- a/src/bin/panes.c
+++ b/src/bin/panes.c
@@ -67,10 +67,17 @@ panes_full_view_cancel(panes_data *pd)
 }
 
 static void
-hotkeys_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj EINA_UNUSED,
+hotkeys_clicked_cb(void *data EINA_UNUSED, Evas_Object *obj,
                    void *event_info EINA_UNUSED)
 {
    base_hotkey_toggle();
+
+   Evas_Object *img = elm_object_content_get(obj);
+
+   if (config_hotkeys_get())
+     elm_image_file_set(img, EDJE_PATH, "hotkeys_close");
+   else
+     elm_image_file_set(img, EDJE_PATH, "hotkeys_open");
 }
 
 static void
@@ -201,7 +208,7 @@ panes_init(Evas_Object *parent)
 
    //Hotkey Image
    img = elm_image_add(hotkeys_btn);
-   elm_image_file_set(img, EDJE_PATH, "hotkeys");
+   elm_image_file_set(img, EDJE_PATH, "hotkeys_close");
    evas_object_show(img);
 
    elm_object_content_set(hotkeys_btn, img);