diff --git a/themes/default/templates/index.html.ep b/themes/default/templates/index.html.ep
index d927f82..fcd4353 100644
--- a/themes/default/templates/index.html.ep
+++ b/themes/default/templates/index.html.ep
@@ -9,11 +9,9 @@
         <div class="form-group">
             <label for="gallery-url-input"><%= l('Gallery link') %></label>
             <div class="input-group">
-                <div class="input-group-addon">
-                    <a id="gallery-url-link" href="#" target="_blank" title="<%= l('Gallery link') %>">
-                        <span class="icon icon-picture"></span>
-                    </a>
-                </div>
+                <a class="input-group-addon" id="gallery-url-link" href="#" target="_blank" title="<%= l('Gallery link') %>">
+                    <span class="icon icon-picture"></span>
+                </a>
                 <input class="form-control" name="gallery-url-input" type="text" id="gallery-url-input" readonly></input>
                 <a href="#" class="input-group-addon jsonly copy-to-clipboard-link" title="<%= l('Copy to clipboard') %>">
                     <span class="icon icon-clipboard"></span>
@@ -27,11 +25,9 @@
         <div class="form-group">
             <label for="zip-url-input"><%= l('Download zip link') %></label>
             <div class="input-group">
-                <div class="input-group-addon">
-                    <a id="zip-url-link" href="#" target="_blank" title="<%= l('Download zip link') %>">
-                        <span class="icon icon-file-archive"></span>
-                    </a>
-                </div>
+                <a class="input-group-addon" id="zip-url-link" href="#" target="_blank" title="<%= l('Download zip link') %>">
+                    <span class="icon icon-file-archive"></span>
+                </a>
                 <input class="form-control" name="zip-url-input" type="text" id="zip-url-input" readonly></input>
                 <a href="#" class="input-group-addon jsonly copy-to-clipboard-link" title="<%= l('Copy to clipboard') %>">
                     <span class="icon icon-clipboard"></span>
@@ -45,11 +41,9 @@
         <div class="form-group">
             <label for="random-url-input"><%= l('Random image link') %></label>
             <div class="input-group">
-                <div class="input-group-addon">
-                    <a id="random-url-link" href="#" target="_blank" title="<%= l('Random image link') %>">
-                        <span class="icon icon-shuffle"></span>
-                    </a>
-                </div>
+                <a class="input-group-addon" id="random-url-link" href="#" target="_blank" title="<%= l('Random image link') %>">
+                    <span class="icon icon-shuffle"></span>
+                </a>
                 <input class="form-control" name="random-url-input" type="text" id="random-url-input" readonly></input>
                 <a href="#" class="input-group-addon jsonly copy-to-clipboard-link" title="<%= l('Copy to clipboard') %>">
                     <span class="icon icon-clipboard"></span>
diff --git a/themes/default/templates/myfiles.html.ep b/themes/default/templates/myfiles.html.ep
index dccb204..32b3d2c 100644
--- a/themes/default/templates/myfiles.html.ep
+++ b/themes/default/templates/myfiles.html.ep
@@ -59,11 +59,9 @@
         <div class="form-group">
             <label for="gallery-url-input"><%= l('Gallery link') %></label>
             <div class="input-group">
-                <div class="input-group-addon">
-                    <a id="gallery-url-link" href="#" target="_blank" title="<%= l('Gallery link') %>">
-                        <span class="icon icon-picture"></span>
-                    </a>
-                </div>
+                <a class="input-group-addon" id="gallery-url-link" href="#" target="_blank" title="<%= l('Gallery link') %>">
+                    <span class="icon icon-picture"></span>
+                </a>
                 <input class="form-control" name="gallery-url-input" type="text" id="gallery-url-input" readonly></input>
                 <a href="#" class="input-group-addon jsonly copy-to-clipboard-link" title="<%= l('Copy to clipboard') %>">
                     <span class="icon icon-clipboard"></span>
@@ -77,11 +75,9 @@
         <div class="form-group">
             <label for="zip-url-input"><%= l('Download zip link') %></label>
             <div class="input-group">
-                <div class="input-group-addon">
-                    <a id="zip-url-link" href="#" target="_blank" title="<%= l('Download zip link') %>">
-                        <span class="icon icon-file-archive"></span>
-                    </a>
-                </div>
+                <a class="input-group-addon" id="zip-url-link" href="#" target="_blank" title="<%= l('Download zip link') %>">
+                    <span class="icon icon-file-archive"></span>
+                </a>
                 <input class="form-control" name="zip-url-input" type="text" id="zip-url-input" readonly></input>
                 <a href="#" class="input-group-addon jsonly copy-to-clipboard-link" title="<%= l('Copy to clipboard') %>">
                     <span class="icon icon-clipboard"></span>
@@ -95,11 +91,9 @@
         <div class="form-group">
             <label for="random-url-input"><%= l('Random image link') %></label>
             <div class="input-group">
-                <div class="input-group-addon">
-                    <a id="random-url-link" href="#" target="_blank" title="<%= l('Random image link') %>">
-                        <span class="icon icon-shuffle"></span>
-                    </a>
-                </div>
+                <a class="input-group-addon" id="random-url-link" href="#" target="_blank" title="<%= l('Random image link') %>">
+                    <span class="icon icon-shuffle"></span>
+                </a>
                 <input class="form-control" name="random-url-input" type="text" id="random-url-input" readonly></input>
                 <a href="#" class="input-group-addon jsonly copy-to-clipboard-link" title="<%= l('Copy to clipboard') %>">
                     <span class="icon icon-clipboard"></span>
diff --git a/themes/default/templates/partial/common.js.ep b/themes/default/templates/partial/common.js.ep
index 61aa447..5ffe430 100644
--- a/themes/default/templates/partial/common.js.ep
+++ b/themes/default/templates/partial/common.js.ep
@@ -177,7 +177,7 @@ function link(url, dl, token, modify, only_url) {
         return [
             '<label class="sr-only" for="link-del-', url, '"><%= l('Deletion link') %></label>',
             '<div class="input-group input-group-sm">',
-                '<div class="input-group-btn">',
+                '<div class="input-group-btn adjust-addon">',
                     '<a class="btn btn-default text-danger" href="#" title="<%= l('Deletion link') %>" id="del-', url, '" data-short="', url, '" data-token="', token, '">',
                         '<span class="icon icon-trash"></span> ',
                     '</a>',