diff --git a/client_logins.php b/client_logins.php
index f1a494ac..3e1c3ff1 100644
--- a/client_logins.php
+++ b/client_logins.php
@@ -104,9 +104,10 @@ $num_rows = mysqli_fetch_row(mysqli_query($mysqli,"SELECT FOUND_ROWS()"));
                 <?php echo $login_name; ?>
               </a>
             </td>
-            <td><?php echo $login_uri; ?><button class="btn clipboardjs" data-clipboard-text="<?php echo $login_uri; ?>"><i class="far fa-clipboard"></i></button></td>
-            <td><?php echo $login_username; ?><button class="btn clipboardjs" data-clipboard-text="<?php echo $login_username; ?>"><i class="far fa-clipboard"></i></button></td>
-            <td><?php echo $login_password; ?><button class="btn"><i class="far fa-eye" data-toggle="password"></i></button><button class="btn clipboardjs" data-clipboard-text="<?php echo $login_password; ?>"><i class="far fa-clipboard"></i></button></td>
+            <td><?php echo $login_uri; ?><button class="btn btn-sm" data-clipboard-text="<?php echo $login_uri; ?>"><i class="far fa-copy text-secondary"></i></button></td>
+            <td><?php echo $login_username; ?><button class="btn btn-sm" data-clipboard-text="<?php echo $login_username; ?>"><i class="far fa-copy text-secondary"></i></button></td>
+            <td><?php echo $login_password; ?><button class="btn btn-sm" data-clipboard-text="<?php echo $login_password; ?>"><i class="far fa-copy text-secondary"></i></button></td>
+            </td>
             <td><?php echo "-"; ?></td>
             <td>
               <div class="dropdown dropleft text-center">
diff --git a/edit_login_modal.php b/edit_login_modal.php
index 1c5f6e93..23e04fae 100644
--- a/edit_login_modal.php
+++ b/edit_login_modal.php
@@ -60,7 +60,7 @@
                     <span class="input-group-text"><i class="fa fa-fw fa-eye"></i></span>
                   </div>
                   <div class="input-group-append">
-                    <button class="btn btn-default clipboardjs" type="button" data-clipboard-text="<?php echo $login_password; ?>"><i class="fa fa-fw fa-copy"></i></button>
+                    <button class="btn btn-default" type="button" data-clipboard-text="<?php echo $login_password; ?>"><i class="fa fa-fw fa-copy"></i></button>
                   </div>
                 </div>
               </div>
@@ -76,7 +76,7 @@
                     <span class="input-group-text"><i class="fa fa-fw fa-link"></i></span>
                   </div>
                   <div class="input-group-append">
-                    <button class="input-group-text clipboardjs" type="button" data-clipboard-text="<?php echo $login_uri; ?>"><i class="fa fa-fw fa-copy"></i></button>
+                    <button class="input-group-text" type="button" data-clipboard-text="<?php echo $login_uri; ?>"><i class="fa fa-fw fa-copy"></i></button>
                   </div>
                 </div>
               </div>
diff --git a/js/app.js b/js/app.js
index bbff55d0..f2d800f5 100644
--- a/js/app.js
+++ b/js/app.js
@@ -25,39 +25,41 @@ $('.datetimepicker').datetimepicker({
 // Data Input Mask
 $('[data-mask]').inputmask();
 
-// Tooltip ClipboardJS
-
-$('.clipboardjs').tooltip({
-  trigger: 'click',
-  placement: 'bottom'
-});
-
-function setTooltip(message) {
-  $('.clipboardjs').tooltip('hide')
-    .attr('data-original-title', message)
-    .tooltip('show');
-}
-
-function hideTooltip() {
-  setTimeout(function() {
-    $('.clipboardjs').tooltip('hide');
-  }, 1000);
-}
-
 // ClipboardJS
 
 //Fix to allow Clipboard Copying within Bootstrap Modals
 //For use in Bootstrap Modals or with any other library that changes the focus you'll want to set the focused element as the container value.
 $.fn.modal.Constructor.prototype._enforceFocus = function() {};
 
-var clipboard = new ClipboardJS('.clipboardjs');
+// Tooltip
+
+$('button').tooltip({
+  trigger: 'click',
+  placement: 'bottom'
+});
+
+function setTooltip(btn, message) {
+  $(btn).tooltip('hide')
+    .attr('data-original-title', message)
+    .tooltip('show');
+}
+
+function hideTooltip(btn) {
+  setTimeout(function() {
+    $(btn).tooltip('hide');
+  }, 1000);
+}
+
+// Clipboard
+
+var clipboard = new ClipboardJS('button');
 
 clipboard.on('success', function(e) {
-  setTooltip('Copied!');
-  hideTooltip();
+  setTooltip(e.trigger, 'Copied!');
+  hideTooltip(e.trigger);
 });
 
 clipboard.on('error', function(e) {
-  setTooltip('Failed!');
-  hideTooltip();
+  setTooltip(e.trigger, 'Failed!');
+  hideTooltip(e.trigger);
 });
\ No newline at end of file