diff --git a/gulpfile.js b/gulpfile.js
index 52815b13dc..e86d2400ca 100644
--- a/gulpfile.js
+++ b/gulpfile.js
@@ -93,10 +93,6 @@ gulp.task('lib', ['clean:lib'], function () {
             src: paths.npmDir + 'ngclipboard/dist/ngclipboard.js',
             dest: paths.libDir + 'ngclipboard'
         },
-        {
-            src: paths.npmDir + 'angularjs-slider/dist/rzslider.js',
-            dest: paths.libDir + 'angularjs-slider'
-        },
         {
             src: paths.npmDir + 'clipboard/dist/clipboard.js',
             dest: paths.libDir + 'clipboard'
diff --git a/package.json b/package.json
index 64302a750c..ff4ad3de7b 100644
--- a/package.json
+++ b/package.json
@@ -22,7 +22,6 @@
     "merge-stream": "1.0.1",
     "angular-toastr": "2.1.1",
     "q": "1.5.0",
-    "angularjs-slider": "6.1.1",
     "sweetalert": "1.1.3",
     "angular-sweetalert": "1.1.2",
     "angulartics": "1.4.0",
diff --git a/src/popup/app/tools/toolsModule.js b/src/popup/app/tools/toolsModule.js
index 65c8e26227..8fa52b826a 100644
--- a/src/popup/app/tools/toolsModule.js
+++ b/src/popup/app/tools/toolsModule.js
@@ -1,2 +1,2 @@
 angular
-    .module('bit.tools', ['ngAnimate', 'ngclipboard', 'toastr', 'rzModule', 'oitozero.ngSweetAlert']);
+    .module('bit.tools', ['ngAnimate', 'ngclipboard', 'toastr', 'oitozero.ngSweetAlert']);
diff --git a/src/popup/app/tools/toolsPasswordGeneratorController.js b/src/popup/app/tools/toolsPasswordGeneratorController.js
index fcaa452b89..63a64eb1da 100644
--- a/src/popup/app/tools/toolsPasswordGeneratorController.js
+++ b/src/popup/app/tools/toolsPasswordGeneratorController.js
@@ -12,32 +12,22 @@
         utilsService.initListSectionItemListeners($(document), angular);
         $scope.password = '-';
 
-        $scope.slider = {
-            value: 12,
-            options: {
-                floor: 5,
-                ceil: 128,
-                step: 1,
-                hideLimitLabels: true,
-                hidePointerLabels: true,
-                onChange: function () {
-                    $scope.options.length = $scope.slider.value;
-                    $scope.regenerate(false);
-                },
-                onEnd: function () {
-                    $analytics.eventTrack('Generated Password');
-                    $scope.saveOptions($scope.options);
-                }
-            }
-        };
-
         $q.when(passwordGenerationService.getOptions()).then(function (options) {
             $scope.options = options;
-            $scope.slider.value = options.length;
             $scope.regenerate(false);
             $analytics.eventTrack('Generated Password');
         });
 
+        $scope.sliderMoved = function () {
+            $scope.regenerate(false);
+        };
+
+        $('#length').change(function (e) {
+            e.preventDefault();
+            $analytics.eventTrack('Generated Password');
+            $scope.saveOptions($scope.options);
+        });
+
         $scope.regenerate = function (trackRegenerateEvent) {
             if (trackRegenerateEvent) {
                 $analytics.eventTrack('Regenerated Password');
diff --git a/src/popup/app/tools/views/tools.html b/src/popup/app/tools/views/tools.html
index da905fc66d..63ee376a69 100644
--- a/src/popup/app/tools/views/tools.html
+++ b/src/popup/app/tools/views/tools.html
@@ -5,7 +5,7 @@
     <div class="list">
         <div class="list-section">
             <div class="list-section-items">
-                <a class="list-section-item wrap" href="" ui-sref="passwordGenerator({animation: 'in-slide-up'})">
+                <a class="list-section-item wrap" ui-sref="passwordGenerator({animation: 'in-slide-up'})">
                     <span class="leading-icon" style="color: #eba776;"><i class="fa fa-refresh fa-fw"></i></span>
                     <span class="text">{{i18n.passGen}}</span>
                     <span class="detail">{{i18n.passGenInfo}}</span>
@@ -35,7 +35,7 @@
                     <span class="text">{{i18n.importLogins}}</span>
                     <span class="detail">{{i18n.importLoginsInfo}}</span>
                 </a>
-                <a class="list-section-item wrap" href="" ui-sref="export({animation: 'in-slide-up'})">
+                <a class="list-section-item wrap" ui-sref="export({animation: 'in-slide-up'})">
                     <span class="leading-icon" style="color: #ff6f6f;"><i class="fa fa-cloud-download fa-fw"></i></span>
                     <span class="text">{{i18n.exportVault}}</span>
                     <span class="detail">{{i18n.exportVaultInfo}}</span>
diff --git a/src/popup/app/tools/views/toolsPasswordGenerator.html b/src/popup/app/tools/views/toolsPasswordGenerator.html
index dcc80599f6..f474c273e2 100644
--- a/src/popup/app/tools/views/toolsPasswordGenerator.html
+++ b/src/popup/app/tools/views/toolsPasswordGenerator.html
@@ -30,9 +30,11 @@
             <div class="list-section-items">
                 <div class="list-section-item list-section-item-slider">
                     <label for="length">{{i18n.length}}</label>
-                    <span class="slider-value">{{slider.value}}</span>
-                    <rzslider rz-slider-model="slider.value"
-                              rz-slider-options="slider.options"></rzslider>
+                    <span class="slider-value">{{options.length}}</span>
+                    <div class="slider-wrapper">
+                        <input id="length" type="range" min="5" max="128" step="1" ng-model="options.length"
+                               ng-change="sliderMoved()">
+                    </div>
                 </div>
                 <div class="list-section-item list-section-item-checkbox">
                     <label for="uppercase">A-Z</label>
diff --git a/src/popup/index.html b/src/popup/index.html
index 5516181e15..0f18e5b330 100644
--- a/src/popup/index.html
+++ b/src/popup/index.html
@@ -25,7 +25,6 @@
     <script src="../lib/ngclipboard/ngclipboard.js"></script>
     <script src="../lib/sweetalert/sweetalert-dev.js"></script>
     <script src="../lib/sweetalert/SweetAlert.js"></script>
-    <script src="../lib/angularjs-slider/rzslider.js"></script>
     <script src="../lib/angulartics/angulartics.js"></script>
     <script src="../lib/angulartics/angulartics-ga.js"></script>
     <script src="../lib/ng-infinite-scroll/ng-infinite-scroll.js"></script>
diff --git a/src/popup/less/components.less b/src/popup/less/components.less
index e59cbbf4e6..da1e25e57c 100644
--- a/src/popup/less/components.less
+++ b/src/popup/less/components.less
@@ -409,10 +409,24 @@
         &.list-section-item-slider {
             .slider-value {
                 color: @gray-light;
+                text-align: right;
+                min-width: 45px;
+            }
 
-                &:before {
-                    content: "\00a0 \00a0 \00a0 \00a0 \00a0 \00a0 \00a0";
-                }
+            > * {
+                display: table-cell !important;
+                vertical-align: middle;
+            }
+
+            input {
+                width: 100%;
+                margin: 0;
+            }
+
+            .slider-wrapper {
+                width: 100%;
+                padding: 0 0 0 20px;
+                max-width: 500px;
             }
         }
 
diff --git a/src/popup/less/plugins.less b/src/popup/less/plugins.less
index eda709677f..ebc30fc56b 100644
--- a/src/popup/less/plugins.less
+++ b/src/popup/less/plugins.less
@@ -1,21 +1,4 @@
 @import (reference) "variables.less";
-@import "../../../node_modules/angularjs-slider/src/rzslider.less";
-
-/* Slider */
-
-@handleSize: 15px;
-@barDimension: 2px;
-@handleBgColor: @brand-primary;
-@handleInnerColor: @handleBgColor;
-@handleActiveColor: @handleBgColor;
-@handleHoverColor: @handleBgColor;
-@barNormalColor: @border-color-dark;
-
-.list-section-item-slider .rzslider {
-    width: 160px;
-    margin: 9px 0 0 5px;
-    float: right;
-}
 
 /* Toastr */