diff --git a/assets/audio/sonar.mp3 b/assets/audio/sonar.mp3
deleted file mode 100644
index 3cc376a..0000000
Binary files a/assets/audio/sonar.mp3 and /dev/null differ
diff --git a/assets/audio/sonar.ogg b/assets/audio/sonar.ogg
deleted file mode 100644
index 77aadec..0000000
Binary files a/assets/audio/sonar.ogg and /dev/null differ
diff --git a/index.html b/index.html
index 6d59ab6..f6be8b1 100644
--- a/index.html
+++ b/index.html
@@ -270,7 +270,6 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
         <div input-bar input-id="sendMessage" command="command"></div>
       </div>
     </div>
-    <div id="soundNotification"></div>
     <div id="settingsModal" class="gb-modal" data-state="hidden">
       <div class="backdrop" ng-click="closeModal($event)"></div>
       <div class="modal-dialog">
@@ -390,16 +389,6 @@ $ openssl req -nodes -newkey rsa:4096 -keyout relay.pem -x509 -days 365 -out rel
                   </div>
                 </form>
               </li>
-              <li>
-                <form class="form-inline" role="form">
-                  <div class="checkbox">
-                    <label>
-                      <input type="checkbox" ng-model="soundnotification">
-                      Play sound on notification
-                    </label>
-                  </div>
-                </form>
-              </li>
             </ul>
           </div>
           <div class="modal-footer">
diff --git a/js/glowingbear.js b/js/glowingbear.js
index d8c70fd..e783eeb 100644
--- a/js/glowingbear.js
+++ b/js/glowingbear.js
@@ -201,6 +201,11 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
         models.reinitialize();
         $rootScope.$emit('notificationChanged');
         $scope.connectbutton = 'Connect';
+
+        // Clear all cordova notifications
+        if (window.plugin !== undefined && window.plugin.notification !== undefined && window.plugin.notification.local !== undefined) {
+            window.plugin.notification.local.cancelAll();
+        }
     });
     $scope.connectbutton = 'Connect';
 
@@ -260,8 +265,6 @@ weechat.controller('WeechatCtrl', ['$rootScope', '$scope', '$store', '$timeout',
     $store.bind($scope, "showtimestamp", showtimestamp);
     // Save setting for showing seconds on timestamps
     $store.bind($scope, "showtimestampSeconds", false);
-    // Save setting for playing sound on notification
-    $store.bind($scope, "soundnotification", false);
     // Save setting for font family
     $store.bind($scope, "fontfamily");
     // Save setting for theme
diff --git a/js/notifications.js b/js/notifications.js
index 04e9903..88dbf24 100644
--- a/js/notifications.js
+++ b/js/notifications.js
@@ -21,6 +21,21 @@ weechat.factory('notifications', ['$rootScope', '$log', 'models', function($root
                 window.webkitNotifications.requestPermission();
             }
         }
+
+        // Add cordova local notification click handler
+        if (window.plugin !== undefined && window.plugin.notification !== undefined && window.plugin.notification.local !== undefined) {
+            window.plugin.notification.local.onclick = function (id, state, json) {
+                // Parse payload
+                var data = JSON.parse(json);
+                var buffer = data.buffer;
+                if (buffer) {
+                    // Hide sidebar, open notification buffer
+                    // TODO does this work?
+                    $rootScope.hideSidebar();
+                    models.setActiveBuffer(buffer);
+                }
+            };
+        }
     };
 
 
@@ -84,31 +99,44 @@ weechat.factory('notifications', ['$rootScope', '$log', 'models', function($root
         title += buffer.shortName;
         title += buffer.fullName.replace(/irc.([^\.]+)\..+/, " ($1)");
 
-        var notification = new Notification(title, {
-            body: body,
-            icon: 'assets/img/favicon.png'
-        });
+        // Chrome for Android doesn't know this
+        if (typeof Notification !== 'undefined') {
+            var notification = new Notification(title, {
+                body: body,
+                icon: 'assets/img/favicon.png'
+            });
 
-        // Cancel notification automatically
-        var timeout = 15*1000;
-        notification.onshow = function() {
-            setTimeout(function() {
+            // Cancel notification automatically
+            var timeout = 15*1000;
+            notification.onshow = function() {
+                setTimeout(function() {
+                    notification.close();
+                }, timeout);
+            };
+
+            // Click takes the user to the buffer
+            notification.onclick = function() {
+                models.setActiveBuffer(buffer.id);
+                window.focus();
                 notification.close();
-            }, timeout);
-        };
-
-        // Click takes the user to the buffer
-        notification.onclick = function() {
-            models.setActiveBuffer(buffer.id);
-            window.focus();
-            notification.close();
-        };
-
-        if ($rootScope.soundnotification) {
-            // TODO fill in a sound file
-            var audioFile = "assets/audio/sonar";
-            var soundHTML = '<audio autoplay="autoplay"><source src="' + audioFile + '.ogg" type="audio/ogg" /><source src="' + audioFile + '.mp3" type="audio/mpeg" /></audio>';
-            document.getElementById("soundNotification").innerHTML = soundHTML;
+            };
+        } else if (window.plugin !== undefined && window.plugin.notification !== undefined && window.plugin.notification.local !== undefined) {
+            // Cordova local notification
+            // Calculate notification id from buffer ID
+            // Needs to be unique number, but we'll only ever have one per buffer
+            var id = parseInt(buffer.id, 16);
+
+            // Cancel previous notification for buffer (if there was one)
+            window.plugin.notification.local.cancel(id);
+
+            // Send new notification
+            window.plugin.notification.local.add({
+                id: id,
+                message: body,
+                title: title,
+                autoCancel: true,
+                json: JSON.stringify({ buffer: buffer.id })  // remember buffer id for when the notification is clicked
+            });
         }
     };