diff --git a/CHANGELOG.md b/CHANGELOG.md
index 84a60a1..4ac721e 100644
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -9,6 +9,9 @@ The format is based on [Keep a Changelog](http://keepachangelog.com/) and this p
 - Adds an indicator to the *GitLens* explorer branch history to mark the synchronization point between the local and remote branch (if available)
 - Adds `${agoOrDate}` and `${authorAgoOrDate}` tokens to `gitlens.blame.format`, `gitlens.currentLine.format`, `gitlens.explorers.commitFormat`, `gitlens.explorers.stashFormat`, and `gitlens.statusBar.format` settings which will honor the `gitlens.defaultDateStyle` setting — closes [#312](https://github.com/eamodio/vscode-gitlens/issues/312)
 
+### Removed
+- Removes the *Open Working File* command from the editor toolbar when the built-in *Open File* command is visible
+
 ### Fixed
 - Fixes [#314](https://github.com/eamodio/vscode-gitlens/issues/314) - Toggle line annotation doesn't work properly
 - Fixes [#310](https://github.com/eamodio/vscode-gitlens/issues/310) - "via Terminal" commands need quoting around work directory
diff --git a/images/dark/icon-open-working-file.svg b/images/dark/icon-open-working-file.svg
index d431e90..a9edc17 100644
--- a/images/dark/icon-open-working-file.svg
+++ b/images/dark/icon-open-working-file.svg
@@ -1,4 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
     <polygon fill="#C5C5C5" points="10,2 7.414,2 8.414,3 9,3 9,3.586 9,4 9,4.414 9,6 12,6 12,13 4,13 4,8 3,8 3,14 13,14 13,5"/>'
-    <polygon fill="#ba7dd9" points="5,1 3,1 5,3 1,3 1,5 5,5 3,7 5,7 8,4"/>
+    <polygon fill="#75BEFF" points="5,1 3,1 5,3 1,3 1,5 5,5 3,7 5,7 8,4"/>
 </svg>
\ No newline at end of file
diff --git a/images/light/icon-open-working-file.svg b/images/light/icon-open-working-file.svg
index 8217810..2ee9b26 100644
--- a/images/light/icon-open-working-file.svg
+++ b/images/light/icon-open-working-file.svg
@@ -1,4 +1,4 @@
 <svg xmlns="http://www.w3.org/2000/svg" width="16" height="16">
     <polygon fill="#424242" points="10,2 7.414,2 8.414,3 9,3 9,3.586 9,4 9,4.414 9,6 12,6 12,13 4,13 4,8 3,8 3,14 13,14 13,5"/>'
-    <polygon fill="#7d16bf" points="5,1 3,1 5,3 1,3 1,5 5,5 3,7 5,7 8,4"/>
+    <polygon fill="#00539C" points="5,1 3,1 5,3 1,3 1,5 5,5 3,7 5,7 8,4"/>
 </svg>
\ No newline at end of file
diff --git a/package.json b/package.json
index 8933bc2..59ef82d 100644
--- a/package.json
+++ b/package.json
@@ -2153,7 +2153,12 @@
             "editor/title": [
                 {
                     "command": "gitlens.openWorkingFile",
-                    "when": "gitlens:activeIsRevision",
+                    "when": "gitlens:activeIsRevision && resourceScheme != git",
+                    "group": "navigation@1"
+                },
+                {
+                    "command": "gitlens.openWorkingFile",
+                    "when": "gitlens:activeIsRevision && resourceScheme == git && !isInDiffEditor",
                     "group": "navigation@1"
                 },
                 {