diff --git a/pype/clockify/clockify.py b/pype/clockify/clockify.py
index 17be642be5..0b84bf3953 100644
--- a/pype/clockify/clockify.py
+++ b/pype/clockify/clockify.py
@@ -35,6 +35,28 @@ class ClockifyModule:
 
         self.set_menu_visibility()
 
+    def process_modules(self, modules):
+        if 'FtrackModule' in modules:
+            actions_path = os.path.sep.join([
+                os.path.dirname(__file__),
+                'ftrack_actions'
+            ])
+            current = os.environ('FTRACK_ACTIONS_PATH', '')
+            if current:
+                current += os.pathsep
+            os.environ['FTRACK_ACTIONS_PATH'] = current + actions_path
+
+        if 'AvalonApps' in modules:
+            from launcher import lib
+            actions_path = os.path.sep.join([
+                os.path.dirname(__file__),
+                'launcher_actions'
+            ])
+            current = os.environ.get('AVALON_ACTIONS', '')
+            if current:
+                current += os.pathsep
+            os.environ['AVALON_ACTIONS'] = current + actions_path
+
     def start_timer_check(self):
         self.bool_thread_check_running = True
         if self.thread_timer_check is None:
diff --git a/pype/ftrack/actions/action_clockify_start.py b/pype/clockify/ftrack_actions/action_clockify_start.py
similarity index 96%
rename from pype/ftrack/actions/action_clockify_start.py
rename to pype/clockify/ftrack_actions/action_clockify_start.py
index 594ec21b78..9ca104ee90 100644
--- a/pype/ftrack/actions/action_clockify_start.py
+++ b/pype/clockify/ftrack_actions/action_clockify_start.py
@@ -17,7 +17,9 @@ class StartClockify(BaseAction):
     #: Action description.
     description = 'Starts timer on clockify'
     #: roles that are allowed to register this action
-    icon = 'https://clockify.me/assets/images/clockify-logo.png'
+    icon = '{}/app_icons/clockify.png'.format(
+        os.environ.get('PYPE_STATICS_SERVER', '')
+    )
     #: Clockify api
     clockapi = ClockifyAPI()
 
diff --git a/pype/ftrack/actions/action_clockify_sync.py b/pype/clockify/ftrack_actions/action_clockify_sync.py
similarity index 97%
rename from pype/ftrack/actions/action_clockify_sync.py
rename to pype/clockify/ftrack_actions/action_clockify_sync.py
index 4cc00225e2..15670be957 100644
--- a/pype/ftrack/actions/action_clockify_sync.py
+++ b/pype/clockify/ftrack_actions/action_clockify_sync.py
@@ -21,7 +21,9 @@ class SyncClocify(BaseAction):
     #: roles that are allowed to register this action
     role_list = ['Pypeclub', 'Administrator']
     #: icon
-    icon = 'https://clockify.me/assets/images/clockify-logo-white.svg'
+    icon = '{}/app_icons/clockify-white.png'.format(
+        os.environ.get('PYPE_STATICS_SERVER', '')
+    )
     #: CLockifyApi
     clockapi = ClockifyAPI()
 
diff --git a/pype/plugins/launcher/actions/ClockifyStart.py b/pype/clockify/launcher_actions/ClockifyStart.py
similarity index 86%
rename from pype/plugins/launcher/actions/ClockifyStart.py
rename to pype/clockify/launcher_actions/ClockifyStart.py
index 9183805c7f..6a9ceaec73 100644
--- a/pype/plugins/launcher/actions/ClockifyStart.py
+++ b/pype/clockify/launcher_actions/ClockifyStart.py
@@ -1,9 +1,7 @@
 from avalon import api, io
 from pype.api import Logger
-try:
-    from pype.clockify import ClockifyAPI
-except Exception:
-    pass
+from pype.clockify import ClockifyAPI
+
 
 log = Logger().get_logger(__name__, "clockify_start")
 
@@ -14,13 +12,10 @@ class ClockifyStart(api.Action):
     label = "Clockify - Start Timer"
     icon = "clockify_icon"
     order = 500
-
-    exec("try: clockapi = ClockifyAPI()\nexcept: clockapi = None")
+    clockapi = ClockifyAPI()
 
     def is_compatible(self, session):
         """Return whether the action is compatible with the session"""
-        if self.clockapi is None:
-            return False
         if "AVALON_TASK" in session:
             return True
         return False
diff --git a/pype/plugins/launcher/actions/ClockifySync.py b/pype/clockify/launcher_actions/ClockifySync.py
similarity index 87%
rename from pype/plugins/launcher/actions/ClockifySync.py
rename to pype/clockify/launcher_actions/ClockifySync.py
index 0895da555d..3bf389796f 100644
--- a/pype/plugins/launcher/actions/ClockifySync.py
+++ b/pype/clockify/launcher_actions/ClockifySync.py
@@ -1,8 +1,5 @@
 from avalon import api, io
-try:
-    from pype.clockify import ClockifyAPI
-except Exception:
-    pass
+from pype.clockify import ClockifyAPI
 from pype.api import Logger
 log = Logger().get_logger(__name__, "clockify_sync")
 
@@ -13,16 +10,11 @@ class ClockifySync(api.Action):
     label = "Sync to Clockify"
     icon = "clockify_white_icon"
     order = 500
-    exec(
-        "try:\n\tclockapi = ClockifyAPI()"
-        "\n\thave_permissions = clockapi.validate_workspace_perm()"
-        "\nexcept:\n\tclockapi = None"
-    )
+    clockapi = ClockifyAPI()
+    have_permissions = clockapi.validate_workspace_perm()
 
     def is_compatible(self, session):
         """Return whether the action is compatible with the session"""
-        if self.clockapi is None:
-            return False
         return self.have_permissions
 
     def process(self, session, **kwargs):