diff --git a/arho_feature_template/plugin.py b/arho_feature_template/plugin.py
index 5b8dc8c..eee14f0 100644
--- a/arho_feature_template/plugin.py
+++ b/arho_feature_template/plugin.py
@@ -43,6 +43,8 @@ def __init__(self) -> None:
         self.actions: list[QAction] = []
         self.menu = Plugin.name
 
+        self.toolbar = iface.addToolBar("ARHO Toolbar")
+
     def add_action(
         self,
         icon_path: str,
@@ -114,7 +116,7 @@ def add_action(
             action.setCheckable(True)
 
         if add_to_toolbar:
-            iface.addToolBarIcon(action)
+            self.toolbar.addAction(action)
 
         if add_to_menu:
             iface.addPluginToMenu(self.menu, action)
@@ -214,6 +216,7 @@ def unload(self) -> None:
         for action in self.actions:
             iface.removePluginMenu(Plugin.name, action)
             iface.removeToolBarIcon(action)
+        iface.mainWindow().removeToolBar(self.toolbar)
         teardown_logger(Plugin.name)
 
         self.templater.template_dock.close()