diff --git a/advancedmegamenu.php b/advancedmegamenu.php
index f042018..9a1aa33 100644
--- a/advancedmegamenu.php
+++ b/advancedmegamenu.php
@@ -432,7 +432,7 @@ class AdvancedMegaMenu extends Module implements WidgetInterface
         $storedPath = $this->storeUploadedImage(
             $_FILES['image'],
             $preset,
-            $preset === 'menu_icon' && $menuDepth >= 2 && $menuType === 'category'
+            $preset === 'menu_icon' && $menuDepth === 2 && $menuType === 'category'
         );
         header('Content-Type: application/json');
         exit(json_encode([
diff --git a/views/js/admin.js b/views/js/admin.js
index bf5c8f9..e350b0a 100644
--- a/views/js/admin.js
+++ b/views/js/admin.js
@@ -468,6 +468,7 @@
       var uploadInput = nodeModal.querySelector('.js-node-icon-upload');
       uploadInput.value = '';
       uploadInput.onchange = function (event) {
+        var currentType = nodeModal.querySelector('.js-node-type').value || node.type || 'link';
         uploadImage(event.target.files[0], 'menu_icon', function (response) {
           node.icon_path = response.path;
           node.icon_url = response.url;
@@ -475,7 +476,7 @@
           serializeTree();
         }, {
           menuDepth: depth,
-          menuType: node.type || 'link'
+          menuType: currentType
         });
       };