diff --git a/admin/themes/default/template/tags.tpl b/admin/themes/default/template/tags.tpl
index c6b1e21ba..0f53598ec 100644
--- a/admin/themes/default/template/tags.tpl
+++ b/admin/themes/default/template/tags.tpl
@@ -164,12 +164,14 @@ var str_tag_found = '{'<b>%d</b> tag found'|@translate}';
     <div class="TagErrors icon-cancel">
     </div>
 
-    <div class="TagSubmit">
-      <span>{'Rename Tag'|@translate}</span>
-    </div>
+    <div class="TagSubmitOptions">
+      <div class="TagSubmit">
+        <span>{'Rename Tag'|@translate}</span>
+      </div>
 
-    <div class="TagCancel" style="display:none;">
-      <span>{'Cancel'|@translate}</span>
+      <div class="TagCancel">
+        <span>{'Cancel'|@translate}</span>
+      </div>
     </div>
   </div>
 </div>
diff --git a/admin/themes/default/theme.css b/admin/themes/default/theme.css
index acfab6acb..b002799dd 100644
--- a/admin/themes/default/theme.css
+++ b/admin/themes/default/theme.css
@@ -3172,21 +3172,30 @@ a#showPermissions:hover {text-decoration: none;}
   padding:5px;
   border-left:solid 3px red;
 }
+
+.TagSubmitOptions {
+  display: flex;
+  flex-direction: row;
+  justify-content: space-between;
+}
+
 .TagSubmit {
   cursor:pointer;
   font-weight:bold;
   color: #3F3E40;
   background-color: #FFA836;
-  padding: 10px;
-  margin: 20px;
+  padding: 10px 20px;
   font-size:1em;
   margin-bottom:0;
+  margin: 0 15px;
 }
 .TagCancel {
-  color: #3F3E40;
-  font-weight: bold;
+  cursor:pointer;
   cursor: pointer;
-  font-size:1em;
+  color: #A4A4A4;
+  padding: 10px 20px;
+  font-size: 1em;
+  font-weight: bold;
 }
 
 /* Picture Edit */
diff --git a/language/en_UK/admin.lang.php b/language/en_UK/admin.lang.php
index c1afaa4e2..a79b56130 100644
--- a/language/en_UK/admin.lang.php
+++ b/language/en_UK/admin.lang.php
@@ -1256,3 +1256,6 @@ $lang['Advanced features'] = 'Advanced features';
 $lang['Global Gallery Actions'] = 'Global Gallery Actions';
 $lang['Purge Actions'] = 'Purge Actions';
 $lang['Purge Cache'] = 'Purge Cache';
+$lang['Rename "%s"'] = 'Rename "%s"';
+$lang['Yes, rename'] = 'Yes, rename';
+$lang['Tag name'] = 'Tag name';
diff --git a/language/fr_FR/admin.lang.php b/language/fr_FR/admin.lang.php
index 0491a5ab4..c0ccca2d6 100644
--- a/language/fr_FR/admin.lang.php
+++ b/language/fr_FR/admin.lang.php
@@ -1258,3 +1258,6 @@ $lang['Advanced features'] = 'Fonctionnalités avancées';
 $lang['Global Gallery Actions'] = 'Actions sur la gallerie';
 $lang['Purge Actions'] = 'Actions de purge';
 $lang['Purge Cache'] = 'Purger le cache';
+$lang['Rename "%s"'] = 'Renommer "%s"';
+$lang['Yes, rename'] = 'Oui, renommer';
+$lang['Tag name'] = 'Nom du tag';