diff --git a/.gitignore b/.gitignore
index 66daf2fcb..59afc3c56 100644
--- a/.gitignore
+++ b/.gitignore
@@ -16,3 +16,5 @@ runtime/ui_BrowserWindow.h
 runtime/.qmake.stash
 web/config_local.py
 pgadmin4.log
+*.swp
+*.swo
diff --git a/web/pgadmin/browser/templates/browser/js/browser.js b/web/pgadmin/browser/templates/browser/js/browser.js
index 8e5e68682..3679fb319 100644
--- a/web/pgadmin/browser/templates/browser/js/browser.js
+++ b/web/pgadmin/browser/templates/browser/js/browser.js
@@ -407,7 +407,7 @@ OWNER TO helpdesk;\n';
             _.sortBy(menus, function(m) { return m.priority; }),
               function(m) {
                 if (m.category == 'create' && !m.disabled(d)) {
-                  createMenu[m.module.type + '_' + m.name] = { name: m.label, icon: m.module.type };
+                  createMenu[m.module.type + '_' + m.name] = { name: m.label, icon: m.icon || m.module.type };
                 }
               });
 
diff --git a/web/pgadmin/browser/utils.py b/web/pgadmin/browser/utils.py
index bd7314d35..665bade23 100644
--- a/web/pgadmin/browser/utils.py
+++ b/web/pgadmin/browser/utils.py
@@ -312,7 +312,7 @@ class NodeView(with_metaclass(MethodViewType, View)):
         """
         return flask.make_response(
                 flask.render_template(
-                    "{0}/{0}.js".format(self.node_type)
+                    "{0}/js/{0}.js".format(self.node_type)
                     ),
                 200, {'Content-Type': 'application/x-javascript'}
                 )
diff --git a/web/pgadmin/utils/ajax.py b/web/pgadmin/utils/ajax.py
index 5b2f4fd71..45416b33b 100644
--- a/web/pgadmin/utils/ajax.py
+++ b/web/pgadmin/utils/ajax.py
@@ -92,3 +92,11 @@ def success_return(message=''):
                 success=1,
                 info=message
     )
+
+def gone(errormsg=''):
+    """Create a response with HTTP status code 410 - GONE."""
+    return make_json_response(
+                status=410,
+                success=0,
+                errormsg=errormsg
+    )