diff --git a/README.md b/README.md
index 11cf988..d3a3527 100644
--- a/README.md
+++ b/README.md
@@ -8,7 +8,6 @@ Brackets-Shell adds a new icon on the right panel: click on it to toggle the she
 ##Options
 Brackets-Shell adds the following options to your brackets.json file:
 
-* `hdy.brackets-shell.dark`: set to true if you are using Bracket's dark theme (defaults to false)
 * `hdy.brackets-shell.trackProject`: set to true if you want to have the Bracket's shell automatically be set to your project's root directory
 * `hdy.brackets-shell.shell`: set to the path of your shell (i.e "/bin/sh" or "/bin/bash"). For Windows this should be set to "cmd.exe"
 
diff --git a/images/hdy.brackets.shell.toolbar.on.png b/images/hdy.brackets.shell.toolbar.on.png
deleted file mode 100644
index aca0123..0000000
Binary files a/images/hdy.brackets.shell.toolbar.on.png and /dev/null differ
diff --git a/images/hdy.brackets.shell.toolbar.on.svg b/images/hdy.brackets.shell.toolbar.on.svg
new file mode 100755
index 0000000..5697c02
--- /dev/null
+++ b/images/hdy.brackets.shell.toolbar.on.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="20px" width="19px" viewBox="0 0 1000 928.571" enable-background="new 0 0 1000 928.571" xml:space="preserve">
+    <path fill="#78B2F2" d="M326.43 548.578l-260.028 260.028q-5.58 5.58 -12.834 5.58t-12.834 -5.58l-27.9 -27.9q-5.58 -5.58 -5.58 -12.834t5.58 -12.834l219.294 -219.294 -219.294 -219.294q-5.58 -5.58 -5.58 -12.834t5.58 -12.834l27.9 -27.9q5.58 -5.58 12.834 -5.58t12.834 5.58l260.028 260.028q5.58 5.58 5.58 12.834t-5.58 12.834zm602.082 255.006v35.712q0 7.812 -5.022 12.834t-12.834 5.022h-535.68q-7.812 0 -12.834 -5.022t-5.022 -12.834v-35.712q0 -7.812 5.022 -12.834t12.834 -5.022h535.68q7.812 0 12.834 5.022t5.022 12.834z"/>
+</svg>
diff --git a/images/hdy.brackets.shell.toolbar.png b/images/hdy.brackets.shell.toolbar.png
deleted file mode 100644
index 6116bcd..0000000
Binary files a/images/hdy.brackets.shell.toolbar.png and /dev/null differ
diff --git a/images/hdy.brackets.shell.toolbar.svg b/images/hdy.brackets.shell.toolbar.svg
new file mode 100755
index 0000000..3e1ce33
--- /dev/null
+++ b/images/hdy.brackets.shell.toolbar.svg
@@ -0,0 +1,4 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<svg xmlns="http://www.w3.org/2000/svg" height="20px" width="19px" viewBox="0 0 1000 928.571" enable-background="new 0 0 1000 928.571" xml:space="preserve">
+    <path fill="#BBBBBB" d="M326.43 548.578l-260.028 260.028q-5.58 5.58 -12.834 5.58t-12.834 -5.58l-27.9 -27.9q-5.58 -5.58 -5.58 -12.834t5.58 -12.834l219.294 -219.294 -219.294 -219.294q-5.58 -5.58 -5.58 -12.834t5.58 -12.834l27.9 -27.9q5.58 -5.58 12.834 -5.58t12.834 5.58l260.028 260.028q5.58 5.58 5.58 12.834t-5.58 12.834zm602.082 255.006v35.712q0 7.812 -5.022 12.834t-12.834 5.022h-535.68q-7.812 0 -12.834 -5.022t-5.022 -12.834v-35.712q0 -7.812 5.022 -12.834t12.834 -5.022h535.68q7.812 0 12.834 5.022t5.022 12.834z"/>
+</svg>
diff --git a/main.js b/main.js
index 963b852..4e43f70 100644
--- a/main.js
+++ b/main.js
@@ -14,14 +14,6 @@ define(function (require, exports, module) {
                                 .attr("title", "Shell")
                                 .appendTo($("#main-toolbar .buttons"));
 
-
-    // Default theme if not defined
-    if(Preferences.get("dark") === undefined) {
-        Preferences.definePreference("dark", "boolean", false);
-        Preferences.set("dark", false);
-        Preferences.save();
-    }
-
     // Default projectTracking if not defined
     if(Preferences.get("trackProject") === undefined) {
         Preferences.definePreference("trackProject", "boolean", true);
diff --git a/shellPanel.js b/shellPanel.js
index a76d388..82fdfc6 100644
--- a/shellPanel.js
+++ b/shellPanel.js
@@ -176,10 +176,6 @@ define(function (require, exports, module) {
             currentCommandResult.append($("<pre>"));
         }
 
-        if (_preferences.get("dark")) {
-            $("pre", currentCommandResult).addClass('hdy-dark-theme');
-        }
-
         if(ansiFormat.hasAceptedAnsiFormat(data)){
             ansiFormat.formattedText(data, currentCommandResult);
         } else {
diff --git a/styles/shellPanel.css b/styles/shellPanel.css
index 72339f0..f562349 100644
--- a/styles/shellPanel.css
+++ b/styles/shellPanel.css
@@ -15,6 +15,10 @@
     background: transparent;
 }
 
+.dark .hdy-command-result pre {
+    color: #AAAAAA;
+}
+
 .hdy-error {
     color: #ff0000;
     color: rgba(255, 0, 0, 0.6);
@@ -45,15 +49,11 @@ div:focus {
 }
 
 .hdy-shell-icon-off {
-    background: url(../images/hdy.brackets.shell.toolbar.png);
+    background: url(../images/hdy.brackets.shell.toolbar.svg) no-repeat center;
 }
 
 .hdy-shell-icon-on {
-    background: url(../images/hdy.brackets.shell.toolbar.on.png);
-}
-
-.hdy-dark-theme {
-    color:#AAAAAA;
+    background: url(../images/hdy.brackets.shell.toolbar.on.svg) no-repeat center;
 }
 
 .hdy-red {