diff --git a/package.json b/package.json
index 4281fe9..99d7866 100644
--- a/package.json
+++ b/package.json
@@ -1,6 +1,6 @@
 {
     "name": "anchr-multi-webservice",
-    "version": "2.1.0",
+    "version": "3.0.0",
     "description": "⚓️ Anchr provides you with a toolbox for tiny tasks on the internet, especially bookmark collections",
     "private": true,
     "scripts": {
diff --git a/public/app/index.html b/public/app/index.html
index 20c9394..0b9f842 100644
--- a/public/app/index.html
+++ b/public/app/index.html
@@ -140,7 +140,6 @@
     <script src="bower_components/snackbarjs/dist/snackbar.min.js"></script>
     <script src="bower_components/ng-file-upload/ng-file-upload.js"></script>
     <script src="bower_components/angular-jwt/dist/angular-jwt.js"></script>
-    <script src="bower_components/crypto-js/crypto-js.js"></script>
     <!-- endbower -->
     <!-- endbuild -->
 
@@ -152,6 +151,7 @@
     <script src="scripts/services/remote.js"></script>
     <script src="scripts/services/image.js"></script>
     <script src="scripts/services/collection.js"></script>
+    <script src="scripts/services/encryption.js"></script>
     <script src="scripts/filters/imageLinkFilters.js"></script>
     <script src="scripts/directives/myenter.js"></script>
     <script src="scripts/directives/apicall.js"></script>
diff --git a/public/app/scripts/controllers/image.js b/public/app/scripts/controllers/image.js
index 5041b28..061341b 100644
--- a/public/app/scripts/controllers/image.js
+++ b/public/app/scripts/controllers/image.js
@@ -1,7 +1,7 @@
 'use strict';
 
 angular.module('anchrClientApp')
-  .controller('ImageCtrl', ['$rootScope', '$scope', 'Upload', '$timeout', function ($rootScope, $scope, Upload, $timeout) {
+  .controller('ImageCtrl', ['$rootScope', '$scope', 'Snackbar', 'Upload', 'Encryption', '$timeout', function ($rootScope, $scope, Snackbar, Upload, Encryption, $timeout) {
     var allowedTypes = ['image/'];
 
     $scope.encryptAndUpload = function (files, errFiles) {
@@ -16,19 +16,27 @@ angular.module('anchrClientApp')
         return false;
       }
 
-      reader.onload = function(e) {
-        var encrypted = CryptoJS.AES.encrypt(e.target.result, password);
-        var blob = new Blob([encrypted], {type: file.type});
-        blob.name = file.name;
-        blob.encrypted = true;
-        $scope.files.loading = false;
-        $scope.uploadFiles([blob], []);
+      reader.onload = function (e) {
+        Encryption.encrypt(e.target.result, password)
+          .then(function (encrypted) {
+            var blob = new Blob([encrypted], { type: file.type });
+            blob.name = file.name;
+            blob.encrypted = true;
+            $scope.files.loading = false;
+            $scope.uploadFiles([blob], []);
+          })
+          .catch(function(error) {
+            console.error(error);
+
+            $scope.files.loading = false;
+            Snackbar.show("Failed to encrypt image.");
+          });
       };
 
-      reader.readAsDataURL(file);
+      reader.readAsArrayBuffer(file);
     };
 
-    $scope.uploadFiles = function(files, errFiles) {
+    $scope.uploadFiles = function (files, errFiles) {
       if ((files && files.length) || (errFiles && errFiles.length)) {
         $scope.files.files = $scope.files.files.concat(files);
         $scope.files.errFiles = $scope.files.errFiles.concat(errFiles);
@@ -41,7 +49,7 @@ angular.module('anchrClientApp')
           else {
             file.upload = Upload.upload({
               url: $rootScope.getApiUrl() + 'image',
-              data: {uploadFile: file, encrypted: file.encrypted}
+              data: { uploadFile: file, encrypted: file.encrypted }
             });
 
             file.upload.then(function (response) {
@@ -63,7 +71,7 @@ angular.module('anchrClientApp')
 
     $scope.clear = function () {
       $scope.files = {
-        files : [],
+        files: [],
         errFiles: [],
         password: null,
         encrypt: false,
@@ -79,8 +87,8 @@ angular.module('anchrClientApp')
       $rootScope.init();
     }
 
-    function arrayMatch (regexArray, val) {
-      for (var i=0; i<regexArray.length; i++) {
+    function arrayMatch(regexArray, val) {
+      for (var i = 0; i < regexArray.length; i++) {
         if (val.match(regexArray[i])) return true;
       }
       return false;
diff --git a/public/app/scripts/controllers/view-image.js b/public/app/scripts/controllers/view-image.js
index 5c6d68c..bfaf9be 100644
--- a/public/app/scripts/controllers/view-image.js
+++ b/public/app/scripts/controllers/view-image.js
@@ -1,51 +1,55 @@
 'use strict';
 
 angular.module('anchrClientApp')
-  .controller('ViewImageCtrl', ['$scope', '$rootScope', '$http', '$location', 'Snackbar', 'Image', 'id', function ($scope, $rootScope, $http, $location, Snackbar, Image, id) {
+  .controller('ViewImageCtrl', ['$scope', '$rootScope', '$http', '$location', 'Snackbar', 'Image', 'Encryption', 'id', function ($scope, $rootScope, $http, $location, Snackbar, Image, Encryption, id) {
     $rootScope.init();
 
     $scope.image = {};
     $scope.data = {
-      password : '',
-      imgSrc : null,
+      password: '',
+      imgSrc: null,
       loading: false
     };
 
-    Image.get.get({id: id}, function(result) {
+    Image.get.get({ id: id }, function (result) {
       $scope.image = result;
       $scope.image.created = Date.parse($scope.image.created);
       $scope.image.link = $location.absUrl();
     });
 
     $scope.decrypt = function () {
-      var relativeHref = new URL($scope.image.href).pathname
       $scope.data.loading = true;
-      $http.get(relativeHref).then(function (result) {
-        var password = $scope.data.password;
-        var reader = new FileReader();
-        var blob = new Blob([result.data], { type: $scope.image.type });
-
-        reader.onload = function(e){
-
-          var decrypted = CryptoJS.AES.decrypt(e.target.result, password).toString(CryptoJS.enc.Latin1);
-
-          if(!/^data:/.test(decrypted)){
-            $scope.data.loading = false;
-            $scope.data.password = '';
-            $scope.$apply();
-            Snackbar.show("Invalid password.");
-            return false;
-          }
 
-          $scope.data.imageSrc = decrypted;
-          $scope.data.loading = false;
-          $scope.$apply();
-        };
-
-        reader.readAsText(blob);
-
-      }, function (err) {
-        console.log(err)
-      });
+      var relativeHref = new URL($scope.image.href).pathname
+      $http.get(relativeHref, { responseType: 'arraybuffer' })
+        .then(function (result) {
+          var password = $scope.data.password;
+
+          Encryption.decrypt(result.data, password)
+            .then(function (decrypted) {
+              var reader = new FileReader();
+              var blob = new Blob([decrypted], { type: $scope.image.type });
+
+              reader.onload = function (event) {
+                var result = event.target.result;
+
+                $scope.data.imageSrc = result;
+                $scope.data.loading = false;
+                $scope.$apply();
+              }
+
+              reader.readAsDataURL(blob)
+            })
+            .catch(function (error) {
+              console.error(error);
+
+              $scope.data.loading = false;
+              $scope.data.password = '';
+              $scope.$apply();
+              Snackbar.show("Invalid password.");
+            })
+        }, function (err) {
+          console.log(err)
+        });
     };
   }]);
diff --git a/public/app/scripts/services/encryption.js b/public/app/scripts/services/encryption.js
new file mode 100644
index 0000000..a4bdb62
--- /dev/null
+++ b/public/app/scripts/services/encryption.js
@@ -0,0 +1,102 @@
+function appendBuffer(buffer1, buffer2) {
+    var tmp = new Uint8Array(buffer1.byteLength + buffer2.byteLength);
+    tmp.set(new Uint8Array(buffer1), 0);
+    tmp.set(new Uint8Array(buffer2), buffer1.byteLength);
+    return tmp.buffer;
+};
+
+function getKeyMaterial(password) {
+    let enc = new TextEncoder();
+    return window.crypto.subtle.importKey(
+        'raw',
+        enc.encode(password),
+        { name: 'PBKDF2' },
+        false,
+        ['deriveBits', 'deriveKey']
+    );
+}
+
+function getKey(keyMaterial, salt) {
+    return window.crypto.subtle.deriveKey(
+        {
+            'name': 'PBKDF2',
+            salt: salt,
+            'iterations': 100000,
+            'hash': 'SHA-256'
+        },
+        keyMaterial,
+        { 'name': 'AES-GCM', 'length': 256 },
+        true,
+        ['encrypt', 'decrypt']
+    );
+}
+
+function encrypt(data, key, iv) {
+    return window.crypto.subtle.encrypt(
+        {
+            name: 'AES-GCM',
+            iv: iv
+        },
+        key,
+        data
+    )
+}
+
+function decrypt(data, key, iv) {
+    return window.crypto.subtle.decrypt(
+        {
+            name: 'AES-GCM',
+            iv: iv
+        },
+        key,
+        data
+    )
+}
+
+angular.module('anchrClientApp')
+    .factory('Encryption', function () {
+        return {
+            /**
+             * Encrypts an image with a password
+             * @param {ArrayBuffer} data The image to be encrypted
+             * @param {string} password The password to use for encryption
+             * @returns {ArrayBuffer} The encrypted binary image data, prefixed with 16 bytes of salt, followed by 12 bytes of initialization vector
+             */
+            encrypt: function (data, password) {
+                var salt = window.crypto.getRandomValues(new Uint8Array(16));
+                var iv = window.crypto.getRandomValues(new Uint8Array(12));
+
+                return getKeyMaterial(password)
+                    .then(function (keyMaterial) {
+                        return getKey(keyMaterial, salt);
+                    })
+                    .then(function (key) {
+                        return encrypt(data, key, iv);
+                    })
+                    .then(function (result) {
+                        var prefix = appendBuffer(salt, iv);
+                        return appendBuffer(prefix, result);
+                    });
+            },
+            /**
+             * Decrypts an image using a password
+             * @param {ArrayBuffer} data The encrypted binary image data, prefixed with 16 bytes of salt, followed by 12 bytes of initialization vector
+             * @param {string} password The password previously used for encryption
+             * @returns {ArrayBuffer} The decrypted image content
+             */
+
+            decrypt: function (data, password) {
+                var salt = data.slice(0, 16);
+                var iv = data.slice(16, 12 + 16);
+                var image = data.slice(12 + 16);
+
+                return getKeyMaterial(password)
+                    .then(function (keyMaterial) {
+                        return getKey(keyMaterial, salt);
+                    })
+                    .then(function (key) {
+                        return decrypt(image, key, iv);
+                    });
+            }
+        }
+    });
diff --git a/public/bower.json b/public/bower.json
index 1f51fbd..5cf416c 100644
--- a/public/bower.json
+++ b/public/bower.json
@@ -11,8 +11,7 @@
     "ngclipboard": "1.1.3",
     "snackbarjs": "1.1.0",
     "ng-file-upload": "12.2.13",
-    "angular-jwt": "0.1.11",
-    "crypto-js": "4.1.1"
+    "angular-jwt": "0.1.11"
   },
   "devDependencies": {
     "angular-mocks": "1.4.0"
@@ -30,9 +29,6 @@
     "bootstrap-sass": {
       "main": [
       ]
-    },
-    "crypto-js": {
-      "main": "crypto-js.js"
     }
   },
   "resolutions": {
diff --git a/public/test/karma.conf.js b/public/test/karma.conf.js
index 9364b5c..4994199 100644
--- a/public/test/karma.conf.js
+++ b/public/test/karma.conf.js
@@ -35,7 +35,6 @@ module.exports = function(config) {
             'bower_components/snackbarjs/dist/snackbar.min.js',
             'bower_components/ng-file-upload/ng-file-upload.js',
             'bower_components/angular-jwt/dist/angular-jwt.js',
-            'bower_components/crypto-js/crypto-js.js',
             'bower_components/angular-mocks/angular-mocks.js',
             // endbower
             "app/scripts/**/*.js",