diff --git a/assets/icons/timemaster.svg b/assets/icons/timemaster.svg
new file mode 100644
index 0000000..9aabb1c
--- /dev/null
+++ b/assets/icons/timemaster.svg
@@ -0,0 +1,14 @@
+<?xml version="1.0" encoding="utf-8"?>
+<svg version="1.1" id="Ebene_1" xmlns="http://www.w3.org/2000/svg" xmlns:xlink="http://www.w3.org/1999/xlink" x="0px" y="0px"
+	 viewBox="0 0 233.6 236" style="enable-background:new 0 0 233.6 236;" xml:space="preserve">
+  <path
+    style="fill:#ffffff;"
+    d="M116.8,3.1L116.8,3.1C53.6,3.1,1.9,54.8,1.9,118l0,0c0,63.2,51.7,114.9,114.9,114.9l0,0c63.2,0,114.9-51.7,114.9-114.9l0,0
+    C231.7,54.8,180,3.1,116.8,3.1L116.8,3.1z M66.7,139.4v12.4H54.3c-6.8,0-12.4-5.5-12.4-12.4V96.6c0-6.8,5.5-12.4,12.4-12.4
+    s12.4,5.5,12.4,12.4V139.4z M84.2,151.8h-0.9c-6.7,0-12.1-5.5-12.1-12.1s5.4-12.1,12.1-12.1h0.8c6.7,0,12.1,5.4,12.1,12.1
+    S90.8,151.8,84.2,151.8z M84,122.4h-0.5c-6.8,0-12.3-5.5-12.3-12.3s5.5-12.3,12.3-12.3H84c6.8,0,12.3,5.5,12.3,12.3
+    S90.8,122.5,84,122.4L84,122.4z M130.3,139.4c0.1,6.9-5.5,12.4-12.4,12.4s-12.4-5.5-12.4-12.4v-29.3c0-6.8,5.5-12.4,12.4-12.4
+    s12.4,5.5,12.4,12.4V139.4z M161,139.4c0,6.9-5.5,12.4-12.4,12.4s-12.4-5.5-12.4-12.4v-29.3c0-6.8,5.5-12.4,12.4-12.4
+    s12.4,5.5,12.4,12.4V139.4z M191.7,139.4c0,6.9-5.5,12.4-12.4,12.4s-12.4-5.5-12.4-12.4v-29.3c0-6.8,5.5-12.4,12.4-12.4
+    s12.4,5.5,12.4,12.4V139.4z"/>
+</svg>
diff --git a/manifest.json b/manifest.json
index 670515d..3c7e1c7 100644
--- a/manifest.json
+++ b/manifest.json
@@ -63,6 +63,19 @@
       "Tooltip": "Shows open pull requests assigned to you across all repositories",
       "UUID": "dev.mars3142.ulanzideck.collection.giteapr"
     },
+    {
+      "Name": "Timemaster",
+      "Icon": "assets/icons/timemaster.svg",
+      "PropertyInspectorPath": "property-inspector/timemaster/inspector.html",
+      "States": [
+        {
+          "Name": "Default",
+          "Image": "assets/icons/timemaster.svg"
+        }
+      ],
+      "Tooltip": "Shows working hours and time account from Timemaster",
+      "UUID": "dev.mars3142.ulanzideck.collection.timemaster"
+    },
     {
       "Name": "Model Railway",
       "Icon": "assets/icons/railway.png",
diff --git a/plugin/app.html b/plugin/app.html
index e43768e..5fbda98 100644
--- a/plugin/app.html
+++ b/plugin/app.html
@@ -19,6 +19,7 @@
   <script src="./actions/GiteaPRAction.js"></script>
   <script src="./actions/RailwayAction.js"></script>
   <script src="./actions/StreamAction.js"></script>
+  <script src="./actions/TimemasterAction.js"></script>
   <script src="./app.js"></script>
 </body>
 </html>
diff --git a/plugin/app.js b/plugin/app.js
index 9119b6b..488b33b 100644
--- a/plugin/app.js
+++ b/plugin/app.js
@@ -26,6 +26,8 @@ $UD.onAdd(jsn => {
       ACTION_CACHES[context] = new RailwayAction($UD, context);
     } else if (name === 'stream') {
       ACTION_CACHES[context] = new StreamAction($UD, context);
+    } else if (name === 'timemaster') {
+      ACTION_CACHES[context] = new TimemasterAction($UD, context);
     }
   }