diff --git a/data/elementary/themes/edc/efl/focus.edc b/data/elementary/themes/edc/efl/focus.edc
index 59ce554679..c56428f8db 100644
--- a/data/elementary/themes/edc/efl/focus.edc
+++ b/data/elementary/themes/edc/efl/focus.edc
@@ -118,7 +118,7 @@ group { name: "efl/focus_highlight/top"; data.item: "version" "123";
    }
    programs {
       program {
-         signal: "efl,action,focus,show"; source: "efl";
+         signal: "efl,focus,visible,on"; source: "efl";
          action: ACTION_STOP;
          target: "pulse";
          target: "pulse2";
@@ -132,17 +132,17 @@ group { name: "efl/focus_highlight/top"; data.item: "version" "123";
          after: "go3";
       }
       program { name: "go3";
-         action: SIGNAL_EMIT "efl,action,focus,show,end" "efl";
+         action: SIGNAL_EMIT "efl,focus,visible,on,done" "efl";
       }
       program {
-         signal: "efl,action,focus,hide"; source: "efl";
+         signal: "efl,focus,visible,off"; source: "efl";
          action: STATE_SET "default" 0.0;
          transition: DECELERATE 0.4;
          target: "clip";
          after: "stop2";
       }
       program { name: "stop2";
-         action: SIGNAL_EMIT "efl,action,focus,hide,end" "efl";
+         action: SIGNAL_EMIT "efl,focus,visible,off,done" "efl";
          after: "stop3";
       }
       program { name: "stop3";
diff --git a/src/lib/elementary/efl_ui_win.c b/src/lib/elementary/efl_ui_win.c
index 679e4aca16..1dec90aa38 100644
--- a/src/lib/elementary/efl_ui_win.c
+++ b/src/lib/elementary/efl_ui_win.c
@@ -1160,14 +1160,14 @@ _elm_win_focus_highlight_visible_set(Efl_Ui_Win_Data *sd,
         if (elm_widget_is_legacy(sd->obj))
           edje_object_signal_emit(fobj, "elm,action,focus,show", "elm");
         else
-          edje_object_signal_emit(fobj, "efl,action,focus,show", "efl");
+          edje_object_signal_emit(fobj, "efl,focus,visible,on", "efl");
      }
    else
      {
         if (elm_widget_is_legacy(sd->obj))
           edje_object_signal_emit(fobj, "elm,action,focus,hide", "elm");
         else
-          edje_object_signal_emit(fobj, "efl,action,focus,hide", "efl");
+          edje_object_signal_emit(fobj, "efl,focus,visible,off", "efl");
      }
 }
 
@@ -4074,7 +4074,7 @@ _elm_win_focus_highlight_init(Efl_Ui_Win_Data *sd)
         else
           {
              edje_object_signal_callback_add(sd->focus_highlight.fobj,
-                                             "efl,action,focus,hide,end", "*",
+                                             "efl,focus,visible,off,done", "*",
                                              _elm_win_focus_highlight_hide, NULL);
              edje_object_signal_callback_add(sd->focus_highlight.fobj,
                                              "efl,action,focus,anim,end", "*",