diff --git a/app/assets/stylesheets/label_templates/label_preview.scss b/app/assets/stylesheets/label_templates/label_preview.scss
index 5aad24849..409f4e68c 100644
--- a/app/assets/stylesheets/label_templates/label_preview.scss
+++ b/app/assets/stylesheets/label_templates/label_preview.scss
@@ -14,7 +14,7 @@
   }
 
   .label-preview__options-button {
-    color: $brand-primary-light;
+    color: $brand-primary;
     cursor: pointer;
   }
 
diff --git a/app/assets/stylesheets/label_templates/show.scss b/app/assets/stylesheets/label_templates/show.scss
index 79c16b87e..56e25596d 100644
--- a/app/assets/stylesheets/label_templates/show.scss
+++ b/app/assets/stylesheets/label_templates/show.scss
@@ -39,6 +39,7 @@
     }
 
     .description {
+      margin: .5em 0 1em;
       padding-left: 16px;
     }
   }
@@ -92,6 +93,7 @@
   .label-view-container {
     cursor: pointer;
     height: calc(100% - 3.5em);
+    margin-top: .5em;
     padding: .5em;
     position: relative;
     white-space: pre;
@@ -115,6 +117,7 @@
 
   .label-textarea {
     height: 100%;
+    margin-top: .5em;
     padding: .5em;
     width: 100%;
   }
diff --git a/app/javascript/vue/label_template/components/label_preview.vue b/app/javascript/vue/label_template/components/label_preview.vue
index 88f789f54..afc53d94e 100644
--- a/app/javascript/vue/label_template/components/label_preview.vue
+++ b/app/javascript/vue/label_template/components/label_preview.vue
@@ -7,7 +7,7 @@
       <div class="label-preview__options-button" @click="optionsOpen = !optionsOpen">
         {{ i18n.t('label_templates.label_preview.options') }}
 
-        <i class="fas" :class="{ 'fa-angle-down': !optionsOpen, 'fa-angle-up': optionsOpen }"></i>
+        <i class="fas" :class="{ 'fa-chevron-down': !optionsOpen, 'fa-chevron-up': optionsOpen }"></i>
       </div>
     </div>
     <div class="label-preview__controls" :class="{'open': optionsOpen}">
diff --git a/app/javascript/vue/label_template/container.vue b/app/javascript/vue/label_template/container.vue
index 0a37cec6f..2c5a9c03c 100644
--- a/app/javascript/vue/label_template/container.vue
+++ b/app/javascript/vue/label_template/container.vue
@@ -48,8 +48,10 @@
           <div class="title">
             {{ i18n.t('label_templates.show.content_title', { format: labelTemplate.attributes.language_type.toUpperCase() }) }}
           </div>
-          <InsertFieldDropdown :labelTemplate="labelTemplate"
-                               @insertField="insertField"
+          <InsertFieldDropdown
+            v-if="editingContent"
+            :labelTemplate="labelTemplate"
+            @insertField="insertField"
           />
         </div>
         <template v-if="editingContent">
@@ -66,7 +68,7 @@
               <i class="fas fa-sync"></i>
               {{ i18n.t('label_templates.show.buttons.refresh') }}
             </div>
-            <div class="btn btn-secondary" @click="editingContent = false">
+            <div class="btn btn-secondary" @mousedown="disableContentEdit">
               {{ i18n.t('general.cancel') }}
             </div>
             <div class="btn btn-primary save-template" @click="updateContent">
@@ -122,13 +124,17 @@
     },
     methods: {
       enableContentEdit() {
-        this.editingContent = true
+        this.editingContent = true;
         this.$nextTick(() => {
           this.$refs.contentInput.focus();
-          $(this.$refs.contentInput).prop('selectionStart', this.cursorPos)
-          $(this.$refs.contentInput).prop('selectionEnd', this.cursorPos)
+          $(this.$refs.contentInput).prop('selectionStart', this.cursorPos);
+          $(this.$refs.contentInput).prop('selectionEnd', this.cursorPos);
         });
       },
+      disableContentEdit() {
+        this.editingContent = false;
+        this.newContent = this.labelTemplate.attributes.content;
+      },
       updateName(newName) {
         $.ajax({
           url: this.labelTemplate.attributes.urls.update,
@@ -150,14 +156,14 @@
         });
       },
       updateContent() {
-        this.cursorPos = $(this.$refs.contentInput).prop('selectionStart')
+        this.cursorPos = $(this.$refs.contentInput).prop('selectionStart');
         $.ajax({
           url: this.labelTemplate.attributes.urls.update,
           type: 'PATCH',
           data: {label_template: {content: this.newContent}},
           success: (result) => {
-            this.labelTemplate.attributes.content = result.data.attributes.content
-            this.editingContent = false
+            this.labelTemplate.attributes.content = result.data.attributes.content;
+            this.editingContent = false;
           }
         });
       },