diff --git a/app/src/main/java/io/xpipe/app/cred/SshAgentKeyListComp.java b/app/src/main/java/io/xpipe/app/cred/SshAgentKeyListComp.java
index 85e5249c4..8ecb8e451 100644
--- a/app/src/main/java/io/xpipe/app/cred/SshAgentKeyListComp.java
+++ b/app/src/main/java/io/xpipe/app/cred/SshAgentKeyListComp.java
@@ -50,7 +50,7 @@ public class SshAgentKeyListComp extends SimpleRegionBuilder {
         var button = new ButtonComp(null, new LabelGraphic.IconGraphic("mdi2m-magnify-scan"), null);
         button.apply(struc -> {
             struc.setOnAction(event -> {
-                DataStoreEntryRef<ShellStore> refToUse = ref.getValue() != null ? ref.getValue() : DataStorage.get().local().ref();
+                DataStoreEntryRef<ShellStore> refToUse = ref != null && ref.getValue() != null ? ref.getValue() : DataStorage.get().local().ref();
                 ThreadHelper.runFailableAsync(() -> {
                     var list = SshAgentKeyList.listAgentIdentities(refToUse, sshIdentityStrategy.getValue());
                     Platform.runLater(() -> {
diff --git a/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryIconComp.java b/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryIconComp.java
index 4ba5eae16..7a05a776f 100644
--- a/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryIconComp.java
+++ b/app/src/main/java/io/xpipe/app/hub/comp/StoreCategoryIconComp.java
@@ -24,13 +24,10 @@ public class StoreCategoryIconComp extends SimpleRegionBuilder {
         var storeIcon = imageComp.build();
         storeIcon.setPadding(new Insets(0, 0, 1.5, 0));
 
-        var background = new Region();
-        background.getStyleClass().add("background");
-
         var dots = new FontIcon("mdi2d-dots-horizontal");
         dots.setIconSize((int) (size * 1.1));
 
-        var stack = new StackPane(background, storeIcon, dots);
+        var stack = new StackPane(storeIcon, dots);
         stack.setMinHeight(size);
         stack.setMinWidth(size);
         stack.setMaxHeight(size);