diff --git a/app/src/main/java/io/xpipe/app/hub/action/BranchStoreActionProvider.java b/app/src/main/java/io/xpipe/app/hub/action/HubBranchProvider.java
similarity index 69%
rename from app/src/main/java/io/xpipe/app/hub/action/BranchStoreActionProvider.java
rename to app/src/main/java/io/xpipe/app/hub/action/HubBranchProvider.java
index 94be44096..cfa29698f 100644
--- a/app/src/main/java/io/xpipe/app/hub/action/BranchStoreActionProvider.java
+++ b/app/src/main/java/io/xpipe/app/hub/action/HubBranchProvider.java
@@ -5,7 +5,7 @@ import io.xpipe.core.store.DataStore;
 
 import java.util.List;
 
-public interface BranchStoreActionProvider<T extends DataStore> extends HubMenuItemProvider<T> {
+public interface HubBranchProvider<T extends DataStore> extends HubMenuItemProvider<T> {
 
     List<HubMenuItemProvider<?>> getChildren(DataStoreEntryRef<T> store);
 }
diff --git a/app/src/main/java/io/xpipe/app/hub/action/HubMenuLeafProvider.java b/app/src/main/java/io/xpipe/app/hub/action/HubLeafProvider.java
similarity index 76%
rename from app/src/main/java/io/xpipe/app/hub/action/HubMenuLeafProvider.java
rename to app/src/main/java/io/xpipe/app/hub/action/HubLeafProvider.java
index e3a32b5af..cc6169df1 100644
--- a/app/src/main/java/io/xpipe/app/hub/action/HubMenuLeafProvider.java
+++ b/app/src/main/java/io/xpipe/app/hub/action/HubLeafProvider.java
@@ -1,17 +1,11 @@
 package io.xpipe.app.hub.action;
 
 import io.xpipe.app.action.AbstractAction;
-import io.xpipe.app.browser.action.BrowserAction;
-import io.xpipe.app.browser.action.BrowserActionProvider;
-import io.xpipe.app.browser.file.BrowserEntry;
-import io.xpipe.app.browser.file.BrowserFileSystemTabModel;
 import io.xpipe.app.storage.DataStoreEntryRef;
 import io.xpipe.core.store.DataStore;
 import lombok.SneakyThrows;
 
-import java.util.List;
-
-public interface HubMenuLeafProvider<T extends DataStore> extends HubMenuItemProvider<T> {
+public interface HubLeafProvider<T extends DataStore> extends HubMenuItemProvider<T> {
 
     default boolean isDefault(DataStoreEntryRef<T> o) {
         return false;
diff --git a/app/src/main/java/io/xpipe/app/hub/action/impl/BrowseHubLeafProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/BrowseHubLeafProvider.java
index 22a89081b..6f019cc04 100644
--- a/app/src/main/java/io/xpipe/app/hub/action/impl/BrowseHubLeafProvider.java
+++ b/app/src/main/java/io/xpipe/app/hub/action/impl/BrowseHubLeafProvider.java
@@ -1,6 +1,6 @@
 package io.xpipe.app.hub.action.impl;
 
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.browser.BrowserFullSessionModel;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.core.AppLayoutModel;
@@ -18,7 +18,7 @@ import javafx.beans.value.ObservableValue;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
-public class BrowseHubLeafProvider implements HubMenuLeafProvider<FileSystemStore> {
+public class BrowseHubLeafProvider implements HubLeafProvider<FileSystemStore> {
 
     @Override
     public Action createAction(DataStoreEntryRef<FileSystemStore> ref) {
diff --git a/app/src/main/java/io/xpipe/app/hub/action/impl/CloneHubLeafProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/CloneHubLeafProvider.java
index 8ed953cc5..dba04eb76 100644
--- a/app/src/main/java/io/xpipe/app/hub/action/impl/CloneHubLeafProvider.java
+++ b/app/src/main/java/io/xpipe/app/hub/action/impl/CloneHubLeafProvider.java
@@ -1,6 +1,6 @@
 package io.xpipe.app.hub.action.impl;
 
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.StoreAction;
 import io.xpipe.app.hub.action.StoreActionCategory;
@@ -17,7 +17,7 @@ import lombok.extern.jackson.Jacksonized;
 
 import java.time.Duration;
 
-public class CloneHubLeafProvider implements HubMenuLeafProvider<DataStore> {
+public class CloneHubLeafProvider implements HubLeafProvider<DataStore> {
 
     @Override
     public StoreActionCategory getCategory() {
diff --git a/app/src/main/java/io/xpipe/app/hub/action/impl/EditHubLeafProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/EditHubLeafProvider.java
index 261ff5445..558e0ca9a 100644
--- a/app/src/main/java/io/xpipe/app/hub/action/impl/EditHubLeafProvider.java
+++ b/app/src/main/java/io/xpipe/app/hub/action/impl/EditHubLeafProvider.java
@@ -1,6 +1,6 @@
 package io.xpipe.app.hub.action.impl;
 
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.StoreAction;
 import io.xpipe.app.hub.action.StoreActionCategory;
@@ -14,7 +14,7 @@ import javafx.beans.value.ObservableValue;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
-public class EditHubLeafProvider implements HubMenuLeafProvider<DataStore> {
+public class EditHubLeafProvider implements HubLeafProvider<DataStore> {
 
     @Override
     public StoreActionCategory getCategory() {
diff --git a/app/src/main/java/io/xpipe/app/hub/action/impl/LaunchHubMenuLeafProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/LaunchHubMenuLeafProvider.java
index fac40b156..a1f71d107 100644
--- a/app/src/main/java/io/xpipe/app/hub/action/impl/LaunchHubMenuLeafProvider.java
+++ b/app/src/main/java/io/xpipe/app/hub/action/impl/LaunchHubMenuLeafProvider.java
@@ -1,6 +1,6 @@
 package io.xpipe.app.hub.action.impl;
 
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.BatchHubProvider;
 import io.xpipe.app.hub.action.StoreAction;
@@ -15,7 +15,7 @@ import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
 public class LaunchHubMenuLeafProvider
-        implements HubMenuLeafProvider<DataStore>, BatchHubProvider<DataStore> {
+        implements HubLeafProvider<DataStore>, BatchHubProvider<DataStore> {
 
     @Override
     public StoreActionCategory getCategory() {
diff --git a/app/src/main/java/io/xpipe/app/hub/action/impl/RefreshChildrenHubLeafProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/RefreshChildrenHubLeafProvider.java
index 2d59432e9..f4f9ce83a 100644
--- a/app/src/main/java/io/xpipe/app/hub/action/impl/RefreshChildrenHubLeafProvider.java
+++ b/app/src/main/java/io/xpipe/app/hub/action/impl/RefreshChildrenHubLeafProvider.java
@@ -1,7 +1,6 @@
 package io.xpipe.app.hub.action.impl;
 
-import io.xpipe.app.action.AbstractAction;
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.StoreAction;
 import io.xpipe.app.hub.action.StoreActionCategory;
@@ -15,7 +14,7 @@ import javafx.beans.value.ObservableValue;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
-public class RefreshChildrenHubLeafProvider implements HubMenuLeafProvider<FixedHierarchyStore> {
+public class RefreshChildrenHubLeafProvider implements HubLeafProvider<FixedHierarchyStore> {
 
     @Override
     public StoreActionCategory getCategory() {
diff --git a/app/src/main/java/io/xpipe/app/hub/action/impl/SampleHubLeafProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/SampleHubLeafProvider.java
index 019304284..efe45794a 100644
--- a/app/src/main/java/io/xpipe/app/hub/action/impl/SampleHubLeafProvider.java
+++ b/app/src/main/java/io/xpipe/app/hub/action/impl/SampleHubLeafProvider.java
@@ -1,6 +1,6 @@
 package io.xpipe.app.hub.action.impl;
 
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.ext.ShellStore;
 import io.xpipe.app.hub.action.StoreAction;
@@ -21,7 +21,7 @@ import lombok.extern.jackson.Jacksonized;
 import java.io.BufferedReader;
 import java.io.StringReader;
 
-public class SampleHubLeafProvider implements HubMenuLeafProvider<ShellStore> {
+public class SampleHubLeafProvider implements HubLeafProvider<ShellStore> {
 
     @Override
     public StoreActionCategory getCategory() {
diff --git a/app/src/main/java/io/xpipe/app/hub/action/impl/ScanHubLeafProvider.java b/app/src/main/java/io/xpipe/app/hub/action/impl/ScanHubLeafProvider.java
index 69b775351..0331b27e6 100644
--- a/app/src/main/java/io/xpipe/app/hub/action/impl/ScanHubLeafProvider.java
+++ b/app/src/main/java/io/xpipe/app/hub/action/impl/ScanHubLeafProvider.java
@@ -1,7 +1,7 @@
 package io.xpipe.app.hub.action.impl;
 
 import io.xpipe.app.action.AbstractAction;
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.ext.ShellStore;
 import io.xpipe.app.hub.action.StoreAction;
@@ -17,7 +17,7 @@ import javafx.beans.value.ObservableValue;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
-public class ScanHubLeafProvider implements HubMenuLeafProvider<ShellStore> {
+public class ScanHubLeafProvider implements HubLeafProvider<ShellStore> {
 
     @Override
     public StoreActionCategory getCategory() {
diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryComp.java
index fcaae50ac..553f371d0 100644
--- a/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryComp.java
+++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryComp.java
@@ -1,8 +1,8 @@
 package io.xpipe.app.hub.comp;
 
 import io.xpipe.app.action.ActionProvider;
-import io.xpipe.app.hub.action.BranchStoreActionProvider;
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubBranchProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.comp.Comp;
 import io.xpipe.app.comp.SimpleComp;
 import io.xpipe.app.comp.SimpleCompStructure;
@@ -276,8 +276,8 @@ public abstract class StoreEntryComp extends SimpleComp {
     }
 
     private Comp<?> buildButton(HubMenuItemProvider<?> p) {
-        var leaf = p instanceof HubMenuLeafProvider<?> l ? l : null;
-        var branch = p instanceof BranchStoreActionProvider<?> b ? b : null;
+        var leaf = p instanceof HubLeafProvider<?> l ? l : null;
+        var branch = p instanceof HubBranchProvider<?> b ? b : null;
         var button = new IconButtonComp(
                 p.getIcon(getWrapper().getEntry().ref()),
                 leaf != null
@@ -346,6 +346,7 @@ public abstract class StoreEntryComp extends SimpleComp {
         cats.addFirst(null);
         for (var cat : cats) {
             var items = new ArrayList<MenuItem>();
+
             for (var p : getWrapper().getMinorActionProviders()) {
                 var item = buildMenuItemForAction(p);
                 if (item == null || p.getCategory() != cat) {
@@ -360,7 +361,7 @@ public abstract class StoreEntryComp extends SimpleComp {
                 rename.setOnAction(event -> {
                     name.requestFocus();
                 });
-                items.add(rename);
+                items.add(1, rename);
 
                 var notes = new MenuItem(AppI18n.get("addNotes"), new FontIcon("mdi2n-note-text"));
                 notes.setOnAction(event -> {
@@ -368,7 +369,7 @@ public abstract class StoreEntryComp extends SimpleComp {
                     event.consume();
                 });
                 notes.visibleProperty().bind(BindingsHelper.map(getWrapper().getNotes(), s -> s.getCommited() == null));
-                items.add(notes);
+                items.add(2, notes);
 
                 var readOnly = new MenuItem();
                 readOnly.graphicProperty()
@@ -390,7 +391,7 @@ public abstract class StoreEntryComp extends SimpleComp {
                                 getWrapper().getReadOnly()));
                 readOnly.setOnAction(event ->
                         getWrapper().getEntry().setReadOnly(!getWrapper().getReadOnly().get()));
-                items.add(readOnly);
+                items.add(3, readOnly);
             }
 
             if (cat == StoreActionCategory.DEVELOPER) {
@@ -504,8 +505,8 @@ public abstract class StoreEntryComp extends SimpleComp {
     }
 
     private MenuItem buildMenuItemForAction(ActionProvider p) {
-        var leaf = p instanceof HubMenuLeafProvider<?> l ? l : null;
-        var branch = p instanceof BranchStoreActionProvider<?> b ? b : null;
+        var leaf = p instanceof HubLeafProvider<?> l ? l : null;
+        var branch = p instanceof HubBranchProvider<?> b ? b : null;
         var cs = leaf != null ? leaf : branch;
 
         if (cs == null
diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryWrapper.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryWrapper.java
index c9de484fa..e02fc9c43 100644
--- a/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryWrapper.java
+++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreEntryWrapper.java
@@ -4,8 +4,8 @@ import io.xpipe.app.action.*;
 import io.xpipe.app.ext.LocalStore;
 import io.xpipe.app.ext.ShellStore;
 import io.xpipe.app.ext.SingletonSessionStore;
-import io.xpipe.app.hub.action.BranchStoreActionProvider;
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubBranchProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.hub.action.HubMenuItemProvider;
 import io.xpipe.app.hub.action.impl.EditHubLeafProvider;
 import io.xpipe.app.issue.ErrorEventFactory;
@@ -248,7 +248,7 @@ public class StoreEntryWrapper {
             try {
                 var defaultProvider = ActionProvider.ALL.stream()
                         .filter(e -> entry.getStore() != null
-                                && e instanceof HubMenuLeafProvider<?> def
+                                && e instanceof HubLeafProvider<?> def
                                 && (entry.getValidity().isUsable()
                                         || (!def.requiresValidStore() && entry.getProvider() != null))
                                 && def.getApplicableClass()
@@ -279,7 +279,7 @@ public class StoreEntryWrapper {
                         .collect(Collectors.toCollection(ArrayList::new));
                 newMinorProviders.removeIf(storeActionProvider -> {
                     return newMajorProviders.stream().anyMatch(mj -> {
-                        return mj instanceof BranchStoreActionProvider<?> branch
+                        return mj instanceof HubBranchProvider<?> branch
                                 && branch.getChildren(entry.ref()).stream()
                                         .anyMatch(c -> c.getClass().equals(storeActionProvider.getClass()));
                     });
@@ -313,7 +313,7 @@ public class StoreEntryWrapper {
     }
 
     public boolean showActionProvider(ActionProvider p, boolean major) {
-        if (p instanceof HubMenuLeafProvider<?> leaf) {
+        if (p instanceof HubLeafProvider<?> leaf) {
             return (entry.getValidity().isUsable() || (!leaf.requiresValidStore() && entry.getProvider() != null))
                     && leaf.getApplicableClass()
                             .isAssignableFrom(entry.getStore().getClass())
@@ -321,7 +321,7 @@ public class StoreEntryWrapper {
                     && (!major || leaf.isMajor(entry.ref()));
         }
 
-        if (p instanceof BranchStoreActionProvider<?> branch
+        if (p instanceof HubBranchProvider<?> branch
                 && entry.getStore() != null
                 && branch.getApplicableClass().isAssignableFrom(entry.getStore().getClass())
                 && branch.isApplicable(entry.ref())
@@ -354,7 +354,7 @@ public class StoreEntryWrapper {
         var found = getDefaultActionProvider().getValue();
         entry.notifyUpdate(true, false);
         if (found != null) {
-            if (found instanceof HubMenuLeafProvider<?> def) {
+            if (found instanceof HubLeafProvider<?> def) {
                 def.execute(getEntry().ref());
             }
         } else {
diff --git a/app/src/main/java/module-info.java b/app/src/main/java/module-info.java
index 3258c8847..4f4af227b 100644
--- a/app/src/main/java/module-info.java
+++ b/app/src/main/java/module-info.java
@@ -121,7 +121,7 @@ open module io.xpipe.app {
     uses DataStorageExtensionProvider;
     uses ProcessControlProvider;
 
-    provides ActionProvider with BrowseHubLeafProvider, XPipeUrlProvider, LaunchHubMenuLeafProvider, CloneHubLeafProvider, EditHubLeafProvider,
+    provides ActionProvider with BrowseHubLeafProvider, XPipeUrlProvider, LaunchHubMenuLeafProvider, EditHubLeafProvider, CloneHubLeafProvider,
             DownloadMenuProvider, RefreshChildrenHubLeafProvider,
             ScanHubBatchProvider,
             RunCommandInBrowserActionProvider,
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/identity/LocalIdentityConvertActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/identity/LocalIdentityConvertActionProvider.java
index 0d02ef335..3e5207203 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/identity/LocalIdentityConvertActionProvider.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/identity/LocalIdentityConvertActionProvider.java
@@ -1,7 +1,7 @@
 package io.xpipe.ext.base.identity;
 
 import io.xpipe.app.action.AbstractAction;
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.ext.DataStoreCreationCategory;
 import io.xpipe.app.hub.action.StoreAction;
@@ -17,7 +17,7 @@ import javafx.beans.value.ObservableValue;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
-public class LocalIdentityConvertActionProvider implements HubMenuLeafProvider<LocalIdentityStore> {
+public class LocalIdentityConvertActionProvider implements HubLeafProvider<LocalIdentityStore> {
 
     @Override
     public StoreActionCategory getCategory() {
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/RunScriptActionProviderMenu.java b/ext/base/src/main/java/io/xpipe/ext/base/script/RunScriptActionProviderMenu.java
index 2ae6d9393..33a1ee390 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/script/RunScriptActionProviderMenu.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/script/RunScriptActionProviderMenu.java
@@ -24,7 +24,7 @@ import java.util.List;
 import java.util.stream.Collectors;
 
 public class RunScriptActionProviderMenu
-        implements BranchStoreActionProvider<ShellStore>, BatchHubProvider<ShellStore> {
+        implements HubBranchProvider<ShellStore>, BatchHubProvider<ShellStore> {
 
     @Override
     public StoreActionCategory getCategory() {
@@ -33,7 +33,7 @@ public class RunScriptActionProviderMenu
 
     @Value
     private static class TerminalRunActionProvider
-            implements HubMenuLeafProvider<ShellStore>, BatchHubProvider<ShellStore> {
+            implements HubLeafProvider<ShellStore>, BatchHubProvider<ShellStore> {
 
         ScriptHierarchy hierarchy;
 
@@ -87,7 +87,7 @@ public class RunScriptActionProviderMenu
 
     @Value
     private static class HubRunActionProvider
-            implements HubMenuLeafProvider<ShellStore>, BatchHubProvider<ShellStore> {
+            implements HubLeafProvider<ShellStore>, BatchHubProvider<ShellStore> {
 
         ScriptHierarchy hierarchy;
 
@@ -145,7 +145,7 @@ public class RunScriptActionProviderMenu
 
     @Value
     private static class BackgroundRunActionProvider
-            implements HubMenuLeafProvider<ShellStore>, BatchHubProvider<ShellStore> {
+            implements HubLeafProvider<ShellStore>, BatchHubProvider<ShellStore> {
 
         ScriptHierarchy hierarchy;
 
@@ -200,7 +200,7 @@ public class RunScriptActionProviderMenu
 
     @Value
     private static class ScriptActionProvider
-            implements BranchStoreActionProvider<ShellStore>, BatchHubProvider<ShellStore> {
+            implements HubBranchProvider<ShellStore>, BatchHubProvider<ShellStore> {
 
         ScriptHierarchy hierarchy;
 
@@ -259,17 +259,17 @@ public class RunScriptActionProviderMenu
     }
 
     private static class NoScriptsActionProvider
-            implements HubMenuLeafProvider<ShellStore>, BatchHubProvider<ShellStore> {
+            implements HubLeafProvider<ShellStore>, BatchHubProvider<ShellStore> {
 
         @Override
         public void execute(List<DataStoreEntryRef<ShellStore>> dataStoreEntryRefs) throws Exception {
-            var cat = StoreViewState.get().getCategoryWrapper(DataStorage.get().getStoreCategory(dataStoreEntryRefs.getFirst().get()));
+            var cat = StoreViewState.get().getAllScriptsCategory();
             cat.select();
         }
 
         @Override
         public void execute(DataStoreEntryRef<ShellStore> ref) {
-            var cat = StoreViewState.get().getCategoryWrapper(DataStorage.get().getStoreCategory(ref.get()));
+            var cat = StoreViewState.get().getAllScriptsCategory();
             cat.select();
         }
 
@@ -305,8 +305,7 @@ public class RunScriptActionProviderMenu
     }
 
     private static class ScriptsDisabledActionProvider
-            implements HubMenuLeafProvider<ShellStore>, BatchHubProvider<ShellStore> {
-
+            implements HubLeafProvider<ShellStore>, BatchHubProvider<ShellStore> {
 
         @Override
         public void execute(List<DataStoreEntryRef<ShellStore>> dataStoreEntryRefs) throws Exception {
@@ -352,7 +351,7 @@ public class RunScriptActionProviderMenu
     }
 
     private static class NoStateActionProvider
-            implements HubMenuLeafProvider<ShellStore>, BatchHubProvider<ShellStore> {
+            implements HubLeafProvider<ShellStore>, BatchHubProvider<ShellStore> {
 
         @Override
         public boolean isApplicable(DataStoreEntryRef<ShellStore> o) {
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptQuickEditActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptQuickEditActionProvider.java
index 4b9d4302d..279bdafd2 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptQuickEditActionProvider.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/script/SimpleScriptQuickEditActionProvider.java
@@ -1,7 +1,7 @@
 package io.xpipe.ext.base.script;
 
 import io.xpipe.app.action.AbstractAction;
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.StoreAction;
 import io.xpipe.app.hub.action.StoreActionCategory;
@@ -19,7 +19,7 @@ import lombok.extern.jackson.Jacksonized;
 
 import java.util.Arrays;
 
-public class SimpleScriptQuickEditActionProvider implements HubMenuLeafProvider<SimpleScriptStore> {
+public class SimpleScriptQuickEditActionProvider implements HubLeafProvider<SimpleScriptStore> {
 
     @Override
     public StoreActionCategory getCategory() {
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceCopyAddressActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceCopyAddressActionProvider.java
index 27c1355af..a1004fd0d 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceCopyAddressActionProvider.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceCopyAddressActionProvider.java
@@ -1,7 +1,7 @@
 package io.xpipe.ext.base.service;
 
 import io.xpipe.app.action.AbstractAction;
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.StoreAction;
 import io.xpipe.app.hub.action.StoreActionCategory;
@@ -14,7 +14,7 @@ import javafx.beans.value.ObservableValue;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
-public class ServiceCopyAddressActionProvider implements HubMenuLeafProvider<AbstractServiceStore> {
+public class ServiceCopyAddressActionProvider implements HubLeafProvider<AbstractServiceStore> {
 
     @Override
     public StoreActionCategory getCategory() {
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceRefreshActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceRefreshActionProvider.java
index 30466c221..60695b0b7 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceRefreshActionProvider.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/service/ServiceRefreshActionProvider.java
@@ -1,6 +1,6 @@
 package io.xpipe.ext.base.service;
 
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.BatchHubProvider;
 import io.xpipe.app.hub.action.StoreAction;
@@ -15,7 +15,7 @@ import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
 public class ServiceRefreshActionProvider
-        implements HubMenuLeafProvider<FixedServiceCreatorStore>, BatchHubProvider<FixedServiceCreatorStore> {
+        implements HubLeafProvider<FixedServiceCreatorStore>, BatchHubProvider<FixedServiceCreatorStore> {
 
     @Override
     public StoreActionCategory getCategory() {
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/store/StorePauseActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/store/StorePauseActionProvider.java
index 218b881e2..7a3fee0d5 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/store/StorePauseActionProvider.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/store/StorePauseActionProvider.java
@@ -1,6 +1,6 @@
 package io.xpipe.ext.base.store;
 
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.BatchHubProvider;
 import io.xpipe.app.hub.action.StoreAction;
@@ -14,7 +14,7 @@ import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
 public class StorePauseActionProvider
-        implements HubMenuLeafProvider<PauseableStore>, BatchHubProvider<PauseableStore> {
+        implements HubLeafProvider<PauseableStore>, BatchHubProvider<PauseableStore> {
 
     @Override
     public StoreActionCategory getCategory() {
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/store/StoreRestartActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/store/StoreRestartActionProvider.java
index 1a4f9222f..bab1b9dfb 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/store/StoreRestartActionProvider.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/store/StoreRestartActionProvider.java
@@ -1,6 +1,6 @@
 package io.xpipe.ext.base.store;
 
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.BatchHubProvider;
 import io.xpipe.app.hub.action.StoreAction;
@@ -15,7 +15,7 @@ import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
 public class StoreRestartActionProvider
-        implements HubMenuLeafProvider<DataStore>, BatchHubProvider<DataStore> {
+        implements HubLeafProvider<DataStore>, BatchHubProvider<DataStore> {
 
     @Override
     public StoreActionCategory getCategory() {
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStartActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStartActionProvider.java
index a91a9ad2f..b5ba9ade9 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStartActionProvider.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStartActionProvider.java
@@ -1,6 +1,6 @@
 package io.xpipe.ext.base.store;
 
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.BatchHubProvider;
 import io.xpipe.app.hub.action.StoreAction;
@@ -14,7 +14,7 @@ import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
 public class StoreStartActionProvider
-        implements HubMenuLeafProvider<StartableStore>, BatchHubProvider<StartableStore> {
+        implements HubLeafProvider<StartableStore>, BatchHubProvider<StartableStore> {
 
     @Override
     public StoreActionCategory getCategory() {
diff --git a/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStopActionProvider.java b/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStopActionProvider.java
index ab4e6edc3..bfad2c911 100644
--- a/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStopActionProvider.java
+++ b/ext/base/src/main/java/io/xpipe/ext/base/store/StoreStopActionProvider.java
@@ -1,6 +1,6 @@
 package io.xpipe.ext.base.store;
 
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.BatchHubProvider;
 import io.xpipe.app.hub.action.StoreAction;
@@ -14,7 +14,7 @@ import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
 public class StoreStopActionProvider
-        implements HubMenuLeafProvider<StoppableStore>, BatchHubProvider<StoppableStore> {
+        implements HubLeafProvider<StoppableStore>, BatchHubProvider<StoppableStore> {
 
     @Override
     public StoreActionCategory getCategory() {
diff --git a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerActionProviderMenu.java b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerActionProviderMenu.java
index 297a811cf..49aa72699 100644
--- a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerActionProviderMenu.java
+++ b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerActionProviderMenu.java
@@ -1,6 +1,6 @@
 package io.xpipe.ext.system.incus;
 
-import io.xpipe.app.hub.action.BranchStoreActionProvider;
+import io.xpipe.app.hub.action.HubBranchProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.HubMenuItemProvider;
 import io.xpipe.app.storage.DataStoreEntryRef;
@@ -14,7 +14,7 @@ import javafx.beans.value.ObservableValue;
 
 import java.util.List;
 
-public class IncusContainerActionProviderMenu implements BranchStoreActionProvider<IncusContainerStore> {
+public class IncusContainerActionProviderMenu implements HubBranchProvider<IncusContainerStore> {
 
     @Override
     public Class<IncusContainerStore> getApplicableClass() {
diff --git a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerConsoleActionProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerConsoleActionProvider.java
index 5489bbc5d..761894128 100644
--- a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerConsoleActionProvider.java
+++ b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerConsoleActionProvider.java
@@ -1,7 +1,7 @@
 package io.xpipe.ext.system.incus;
 
 import io.xpipe.app.action.AbstractAction;
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.StoreAction;
 import io.xpipe.app.storage.DataStoreEntryRef;
@@ -13,7 +13,7 @@ import javafx.beans.value.ObservableValue;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
-public class IncusContainerConsoleActionProvider implements HubMenuLeafProvider<IncusContainerStore> {
+public class IncusContainerConsoleActionProvider implements HubLeafProvider<IncusContainerStore> {
 
     @Override
     public AbstractAction createAction(DataStoreEntryRef<IncusContainerStore> ref) {
diff --git a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerEditConfigActionProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerEditConfigActionProvider.java
index bd80b012c..d5f3cb0ba 100644
--- a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerEditConfigActionProvider.java
+++ b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerEditConfigActionProvider.java
@@ -1,7 +1,7 @@
 package io.xpipe.ext.system.incus;
 
 import io.xpipe.app.action.AbstractAction;
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.StoreAction;
 import io.xpipe.app.storage.DataStoreEntryRef;
@@ -13,7 +13,7 @@ import javafx.beans.value.ObservableValue;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
-public class IncusContainerEditConfigActionProvider implements HubMenuLeafProvider<IncusContainerStore> {
+public class IncusContainerEditConfigActionProvider implements HubLeafProvider<IncusContainerStore> {
 
     @Override
     public boolean isMutation() {
diff --git a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerEditRunConfigActionProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerEditRunConfigActionProvider.java
index c1464a42d..1e6ab251d 100644
--- a/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerEditRunConfigActionProvider.java
+++ b/ext/system/src/main/java/io/xpipe/ext/system/incus/IncusContainerEditRunConfigActionProvider.java
@@ -1,7 +1,7 @@
 package io.xpipe.ext.system.incus;
 
 import io.xpipe.app.action.AbstractAction;
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.browser.BrowserFullSessionModel;
 import io.xpipe.app.browser.file.BrowserFileOpener;
 import io.xpipe.app.core.AppI18n;
@@ -17,7 +17,7 @@ import javafx.beans.value.ObservableValue;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
-public class IncusContainerEditRunConfigActionProvider implements HubMenuLeafProvider<IncusContainerStore> {
+public class IncusContainerEditRunConfigActionProvider implements HubLeafProvider<IncusContainerStore> {
 
     @Override
     public boolean isMutation() {
diff --git a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerActionProviderMenu.java b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerActionProviderMenu.java
index a6105a529..b20b20dd2 100644
--- a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerActionProviderMenu.java
+++ b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerActionProviderMenu.java
@@ -1,6 +1,6 @@
 package io.xpipe.ext.system.lxd;
 
-import io.xpipe.app.hub.action.BranchStoreActionProvider;
+import io.xpipe.app.hub.action.HubBranchProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.HubMenuItemProvider;
 import io.xpipe.app.storage.DataStoreEntryRef;
@@ -14,7 +14,7 @@ import javafx.beans.value.ObservableValue;
 
 import java.util.List;
 
-public class LxdContainerActionProviderMenu implements BranchStoreActionProvider<LxdContainerStore> {
+public class LxdContainerActionProviderMenu implements HubBranchProvider<LxdContainerStore> {
 
     @Override
     public Class<LxdContainerStore> getApplicableClass() {
diff --git a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerConsoleActionProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerConsoleActionProvider.java
index 2bf29057b..a472451e2 100644
--- a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerConsoleActionProvider.java
+++ b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerConsoleActionProvider.java
@@ -1,7 +1,7 @@
 package io.xpipe.ext.system.lxd;
 
 import io.xpipe.app.action.AbstractAction;
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.StoreAction;
 import io.xpipe.app.storage.DataStoreEntryRef;
@@ -14,7 +14,7 @@ import javafx.beans.value.ObservableValue;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
-public class LxdContainerConsoleActionProvider implements HubMenuLeafProvider<LxdContainerStore> {
+public class LxdContainerConsoleActionProvider implements HubLeafProvider<LxdContainerStore> {
 
     @Override
     public AbstractAction createAction(DataStoreEntryRef<LxdContainerStore> ref) {
diff --git a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerEditConfigActionProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerEditConfigActionProvider.java
index f951a11cc..e432f313a 100644
--- a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerEditConfigActionProvider.java
+++ b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerEditConfigActionProvider.java
@@ -1,7 +1,7 @@
 package io.xpipe.ext.system.lxd;
 
 import io.xpipe.app.action.AbstractAction;
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.StoreAction;
 import io.xpipe.app.storage.DataStoreEntryRef;
@@ -14,7 +14,7 @@ import javafx.beans.value.ObservableValue;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
-public class LxdContainerEditConfigActionProvider implements HubMenuLeafProvider<LxdContainerStore> {
+public class LxdContainerEditConfigActionProvider implements HubLeafProvider<LxdContainerStore> {
 
     @Override
     public boolean isMutation() {
diff --git a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerEditRunConfigActionProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerEditRunConfigActionProvider.java
index f6ac30933..d0ea2081d 100644
--- a/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerEditRunConfigActionProvider.java
+++ b/ext/system/src/main/java/io/xpipe/ext/system/lxd/LxdContainerEditRunConfigActionProvider.java
@@ -1,7 +1,7 @@
 package io.xpipe.ext.system.lxd;
 
 import io.xpipe.app.action.AbstractAction;
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.browser.BrowserFullSessionModel;
 import io.xpipe.app.browser.file.BrowserFileOpener;
 import io.xpipe.app.core.AppI18n;
@@ -17,7 +17,7 @@ import javafx.beans.value.ObservableValue;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
-public class LxdContainerEditRunConfigActionProvider implements HubMenuLeafProvider<LxdContainerStore> {
+public class LxdContainerEditRunConfigActionProvider implements HubLeafProvider<LxdContainerStore> {
 
     @Override
     public boolean isMutation() {
diff --git a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerActionProviderMenu.java b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerActionProviderMenu.java
index 8388a1cdc..9f32ec9ce 100644
--- a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerActionProviderMenu.java
+++ b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerActionProviderMenu.java
@@ -1,6 +1,6 @@
 package io.xpipe.ext.system.podman;
 
-import io.xpipe.app.hub.action.BranchStoreActionProvider;
+import io.xpipe.app.hub.action.HubBranchProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.HubMenuItemProvider;
 import io.xpipe.app.storage.DataStoreEntryRef;
@@ -13,7 +13,7 @@ import javafx.beans.value.ObservableValue;
 
 import java.util.List;
 
-public class PodmanContainerActionProviderMenu implements BranchStoreActionProvider<PodmanContainerStore> {
+public class PodmanContainerActionProviderMenu implements HubBranchProvider<PodmanContainerStore> {
 
     @Override
     public Class<PodmanContainerStore> getApplicableClass() {
diff --git a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerAttachActionProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerAttachActionProvider.java
index 1be86468f..26aedf627 100644
--- a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerAttachActionProvider.java
+++ b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerAttachActionProvider.java
@@ -1,6 +1,6 @@
 package io.xpipe.ext.system.podman;
 
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.StoreAction;
 import io.xpipe.app.storage.DataStoreEntryRef;
@@ -12,7 +12,7 @@ import javafx.beans.value.ObservableValue;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
-public class PodmanContainerAttachActionProvider implements HubMenuLeafProvider<PodmanContainerStore> {
+public class PodmanContainerAttachActionProvider implements HubLeafProvider<PodmanContainerStore> {
 
     @Override
     public Action createAction(DataStoreEntryRef<PodmanContainerStore> ref) {
diff --git a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerInspectActionProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerInspectActionProvider.java
index 734c75923..c3b579dcb 100644
--- a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerInspectActionProvider.java
+++ b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerInspectActionProvider.java
@@ -1,7 +1,7 @@
 package io.xpipe.ext.system.podman;
 
 import io.xpipe.app.action.AbstractAction;
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.StoreAction;
 import io.xpipe.app.storage.DataStoreEntryRef;
@@ -13,7 +13,7 @@ import javafx.beans.value.ObservableValue;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
-public class PodmanContainerInspectActionProvider implements HubMenuLeafProvider<PodmanContainerStore> {
+public class PodmanContainerInspectActionProvider implements HubLeafProvider<PodmanContainerStore> {
 
     @Override
     public AbstractAction createAction(DataStoreEntryRef<PodmanContainerStore> ref) {
diff --git a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerLogsActionProvider.java b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerLogsActionProvider.java
index 94bed1b2b..48d03b9cd 100644
--- a/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerLogsActionProvider.java
+++ b/ext/system/src/main/java/io/xpipe/ext/system/podman/PodmanContainerLogsActionProvider.java
@@ -1,7 +1,7 @@
 package io.xpipe.ext.system.podman;
 
 import io.xpipe.app.action.AbstractAction;
-import io.xpipe.app.hub.action.HubMenuLeafProvider;
+import io.xpipe.app.hub.action.HubLeafProvider;
 import io.xpipe.app.core.AppI18n;
 import io.xpipe.app.hub.action.StoreAction;
 import io.xpipe.app.storage.DataStoreEntryRef;
@@ -13,7 +13,7 @@ import javafx.beans.value.ObservableValue;
 import lombok.experimental.SuperBuilder;
 import lombok.extern.jackson.Jacksonized;
 
-public class PodmanContainerLogsActionProvider implements HubMenuLeafProvider<PodmanContainerStore> {
+public class PodmanContainerLogsActionProvider implements HubLeafProvider<PodmanContainerStore> {
 
     @Override
     public AbstractAction createAction(DataStoreEntryRef<PodmanContainerStore> ref) {
diff --git a/img/proc/appleContainers_icon.png b/img/proc/appleContainers_icon.png
new file mode 100644
index 000000000..237bb9640
Binary files /dev/null and b/img/proc/appleContainers_icon.png differ