diff --git a/.gitignore b/.gitignore
index 9f6be89..9879054 100644
--- a/.gitignore
+++ b/.gitignore
@@ -5,4 +5,5 @@ node_modules
 .vscode-test/
 vscode-java-debug-*.vsix
 packages/
-dist
\ No newline at end of file
+dist
+.DS_Store
\ No newline at end of file
diff --git a/.vscodeignore b/.vscodeignore
index 538d224..4021d8a 100644
--- a/.vscodeignore
+++ b/.vscodeignore
@@ -17,4 +17,5 @@ tslint.json
 packages
 package-lock.json
 node_modules
-webpack.config.js
\ No newline at end of file
+webpack.config.js
+.DS_Store
\ No newline at end of file
diff --git a/package-lock.json b/package-lock.json
index 934aabe..8fe9fcb 100644
--- a/package-lock.json
+++ b/package-lock.json
@@ -49,9 +49,9 @@
             "dev": true
         },
         "@types/vscode": {
-            "version": "1.42.0",
-            "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.42.0.tgz",
-            "integrity": "sha512-ds6TceMsh77Fs0Mq0Vap6Y72JbGWB8Bay4DrnJlf5d9ui2RSe1wis13oQm+XhguOeH1HUfLGzaDAoupTUtgabw==",
+            "version": "1.47.0",
+            "resolved": "https://registry.npmjs.org/@types/vscode/-/vscode-1.47.0.tgz",
+            "integrity": "sha512-nJA37ykkz9FYA0ZOQUSc3OZnhuzEW2vUhUEo4MiduUo82jGwwcLfyvmgd/Q7b0WrZAAceojGhZybg319L24bTA==",
             "dev": true
         },
         "@webassemblyjs/ast": {
diff --git a/package.json b/package.json
index d1b1aff..90a4459 100644
--- a/package.json
+++ b/package.json
@@ -14,7 +14,7 @@
     "debugger"
   ],
   "engines": {
-    "vscode": "^1.42.0"
+    "vscode": "^1.47.3"
   },
   "license": "SEE LICENSE IN LICENSE.txt",
   "repository": {
@@ -60,11 +60,13 @@
       },
       {
         "command": "java.debug.runJavaFile",
-        "title": "Run"
+        "title": "Run",
+        "icon": "$(play)"
       },
       {
         "command": "java.debug.debugJavaFile",
-        "title": "Debug"
+        "title": "Debug",
+        "icon": "$(debug-alt-small)"
       },
       {
         "command": "java.debug.continueAll",
@@ -108,6 +110,18 @@
           "group": "javadebug@2"
         }
       ],
+      "editor/title": [
+        {
+          "command": "java.debug.runJavaFile",
+          "when": "resourceExtname == .java",
+          "group": "1_run@10"
+        },
+        {
+          "command": "java.debug.debugJavaFile",
+          "when": "resourceExtname == .java",
+          "group": "1_run@20"
+        }
+      ],
       "debug/toolBar": [
         {
           "command": "java.debug.hotCodeReplace",
@@ -686,7 +700,7 @@
     "@types/lodash": "^4.14.137",
     "@types/mocha": "^5.2.7",
     "@types/node": "^8.10.51",
-    "@types/vscode": "1.42.0",
+    "@types/vscode": "1.47.0",
     "cross-env": "^5.2.0",
     "gulp": "^4.0.2",
     "gulp-tslint": "^8.1.4",