diff --git a/airtime_mvc/application/controllers/PreferenceController.php b/airtime_mvc/application/controllers/PreferenceController.php
index 767fd3b62..09188b93d 100644
--- a/airtime_mvc/application/controllers/PreferenceController.php
+++ b/airtime_mvc/application/controllers/PreferenceController.php
@@ -146,6 +146,15 @@ class PreferenceController extends Zend_Controller_Action
         $this->view->form = $watched_dirs_pref;
     }
 
+    public function removeLogoAction()
+    {
+        $this->view->layout()->disableLayout();
+        // Remove reliance on .phtml files to render requests
+        $this->_helper->viewRenderer->setNoRender(true);
+
+        Application_Model_Preference::SetStationLogo("");
+    }
+
     public function streamSettingAction()
     {
         $CC_CONFIG = Config::getConfig();
diff --git a/airtime_mvc/application/models/Preference.php b/airtime_mvc/application/models/Preference.php
index e568e0159..1ba71e782 100644
--- a/airtime_mvc/application/models/Preference.php
+++ b/airtime_mvc/application/models/Preference.php
@@ -589,13 +589,12 @@ class Application_Model_Preference
 
     public static function SetStationLogo($imagePath)
     {
-        if (!empty($imagePath)) {
-            $image = @file_get_contents($imagePath);
-            $image = base64_encode($image);
-            self::setValue("logoImage", $image);
-        } else {
-            Logging::warn("Attempting to set imagePath to empty string");
+        if (empty($imagePath)) {
+            Logging::info("Removed station logo");
         }
+        $image = @file_get_contents($imagePath);
+        $image = base64_encode($image);
+        self::setValue("logoImage", $image);
     }
 
     public static function GetStationLogo()
diff --git a/airtime_mvc/application/views/scripts/form/preferences_general.phtml b/airtime_mvc/application/views/scripts/form/preferences_general.phtml
index 7bf5d487d..99cb4384c 100644
--- a/airtime_mvc/application/views/scripts/form/preferences_general.phtml
+++ b/airtime_mvc/application/views/scripts/form/preferences_general.phtml
@@ -7,7 +7,11 @@
 
         <?php echo $this->element->getElement('stationLogo')->render() ?>
 
-        <div id="Logo-img-container"><img id="logo-img" onload='resizeImg(this, 450, 450);' src="data:image/png;base64,<?php echo $this->element->getView()->logoImg ?>" /></div>
+        <button id="logo-remove-btn" value="Remove" class="btn">Remove</button>
+
+        <div id="Logo-img-container">
+            <img onError="this.onerror = '';this.style.visibility='hidden';$('#logo-remove-btn').hide();" id="logo-img" onload='resizeImg(this, 450, 450);' src="data:image/png;base64,<?php echo $this->element->getView()->logoImg ?>" />
+        </div>
 
         <?php echo $this->element->getElement('locale')->render() ?>
 
diff --git a/airtime_mvc/public/css/styles.css b/airtime_mvc/public/css/styles.css
index 64f6b2569..05987d876 100644
--- a/airtime_mvc/public/css/styles.css
+++ b/airtime_mvc/public/css/styles.css
@@ -2187,6 +2187,14 @@ dd.radio-inline-list, .preferences dd.radio-inline-list, .stream-config dd.radio
     height: 120px;
 }
 
+.preferences #logo-remove-btn {
+    float: right;
+}
+
+.preferences #Logo-img-container {
+    float: left;
+}
+
 #show_time_info {
     font-size:12px;
     height:30px;
diff --git a/airtime_mvc/public/js/airtime/preferences/preferences.js b/airtime_mvc/public/js/airtime/preferences/preferences.js
index 4f37d7033..f7875ec7b 100644
--- a/airtime_mvc/public/js/airtime/preferences/preferences.js
+++ b/airtime_mvc/public/js/airtime/preferences/preferences.js
@@ -104,6 +104,10 @@ $(document).ready(function() {
         return false;
     }).next().hide();
 
+    $('#logo-remove-btn').click(function() {
+        $.post(baseUrl+'Preference/remove-logo', function(json){});
+    });
+
     /* No longer using AJAX for this form. Zend + our code makes it needlessly hard to deal with. -- Albert
     $('#pref_save').live('click', function() {
         var data = $('#pref_form').serialize();