diff --git a/src/js/index.js b/src/js/index.js
index 73e85bffd..13974ae38 100644
--- a/src/js/index.js
+++ b/src/js/index.js
@@ -650,9 +650,9 @@ app.directive('tagInput', function () {
         },
         template:
             '<div class="tag-input-container">' +
-                '<div class="input-tag" data-ng-repeat="tag in tagArray()">' +
-                    '{{tag}}' +
-                    '<div class="delete-tag" data-ng-click="deleteTag($index)">&times;</div>' +
+                '<div class="btn-group input-tag" data-ng-repeat="tag in tagArray()">' +
+                    '<button type="button" class="btn btn-xs btn-primary" disabled>{{ tag }}</button>' +
+                    '<button type="button" class="btn btn-xs btn-primary" data-ng-click="deleteTag($index)">&times;</button>' +
                 '</div>' +
                 '<input type="text" data-ng-model="tagText" ng-blur="addTag()" placeholder="{{placeholder}}"/>' +
             '</div>'
diff --git a/src/theme.scss b/src/theme.scss
index 9d4201283..213d200da 100644
--- a/src/theme.scss
+++ b/src/theme.scss
@@ -1372,13 +1372,13 @@ tag-input {
 
         input {
             flex-grow: 1;
-            height: 18px;
             padding: 0px;
             font-size: 14px;
             line-height: 18px;
             color: black;
             border: 0px;
-            margin: 1px;
+            margin: 4px 0;
+
             &:focus {
                 outline: 0;
                 box-shadow: 0px;
@@ -1386,22 +1386,11 @@ tag-input {
         }
 
         .input-tag {
-            padding: 2px 4px;
-            line-height: 12px;
-            font-size: 11px;
-            background-color: #e3eaf6;
-            border-radius: 2px;
-            margin: 2px 5px 2px 0px;
-            border: 1px solid #a9b6d2;
+            margin: 2px 0;
+            margin-right: 4px;
 
-            .delete-tag {
-                display: inline-block;
-                font-size: 12px;
-                cursor: pointer;
-                padding: 0px 2px;
-                &:hover {
-                    background-color: #96b4d2;
-                }
+            :first-child {
+                cursor: text;
             }
         }
     }