diff --git a/www/common/drive-ui.js b/www/common/drive-ui.js
index c46669e8d..50506f248 100644
--- a/www/common/drive-ui.js
+++ b/www/common/drive-ui.js
@@ -3902,8 +3902,8 @@ define([
         };
 
         if (!APP.loggedIn) {
-            $contextMenu.find('.cp-app-drive-context-delete').text(Messages.fc_remove)
-                .attr('data-icon', 'fa-eraser');
+            $contextMenu.find('.cp-app-drive-context-delete').attr('data-icon', faDelete)
+                .html($contextMenu.find('.cp-app-drive-context-remove').html());
         }
         var deleteOwnedPaths = function (paths, pathsList) {
             pathsList = pathsList || [];
diff --git a/www/common/proxy-manager.js b/www/common/proxy-manager.js
index 4fff83c49..e1cb4c11e 100644
--- a/www/common/proxy-manager.js
+++ b/www/common/proxy-manager.js
@@ -731,6 +731,7 @@ define([
                     // from inside a folder we're trying to delete
                     resolved.main.forEach(function (p) {
                         var el = uo.find(p);
+                        if (p[0] === UserObject.FILES_DATA) { return; }
                         if (uo.isFile(el) || uo.isSharedFolder(el)) { return; }
                         var arr = [];
                         uo.getFilesRecursively(el, arr);