diff --git a/src/main/resources/static/js/categories.js b/src/main/resources/static/js/categories.js
index 24d9bc1c00c768926844b5754f60282f3d9a47f8..810838aa93ba7e3ea55f60f459d4922a5bf15369 100644
--- a/src/main/resources/static/js/categories.js
+++ b/src/main/resources/static/js/categories.js
@@ -79,6 +79,7 @@ $(document).ready(function()
         }
 
         this.classList.add('selected');
+        document.getElementById('button-category-icon-confirm').removeAttribute('disabled');
     });
 
     if($('#modalIconSelect').length)
diff --git a/src/main/resources/static/js/imageSelect.js b/src/main/resources/static/js/imageSelect.js
index e1e3098ed72d6a56293369a1e77c0e1a4e7c2a0e..55511a61449aa034afd7cb15d62dc009d44fe5ea 100644
--- a/src/main/resources/static/js/imageSelect.js
+++ b/src/main/resources/static/js/imageSelect.js
@@ -93,6 +93,7 @@ function selectIcon(item)
     }
 
     item.classList.add('selected');
+    document.getElementById('button-icon-confirm').removeAttribute('disabled');
 }
 
 function uploadImage()
diff --git a/src/main/resources/templates/categories/categoriesFunctions.ftl b/src/main/resources/templates/categories/categoriesFunctions.ftl
index 55a4e3c7d20dd2c0588116d2fdf1125ec26235a9..40d7d7e592861e52c7e7a4807a30fab50fa4cd91 100644
--- a/src/main/resources/templates/categories/categoriesFunctions.ftl
+++ b/src/main/resources/templates/categories/categoriesFunctions.ftl
@@ -53,7 +53,7 @@
         </div>
         <div class="modal-footer background-color">
             <@header.buttonLink url='' icon='clear' localizationKey='cancel' color='red' classes='modal-action modal-close text-white' noUrl=true/>
-            <@header.buttonLink url='' icon='done' id='button-category-icon-confirm' localizationKey='ok' color='green' classes='modal-action modal-close text-white' noUrl=true/>
+            <@header.buttonLink url='' icon='done' id='button-category-icon-confirm' localizationKey='ok' color='green' classes='modal-action modal-close text-white' noUrl=true disabled=true/>
         </div>
     </div>
 </#macro>
diff --git a/src/main/resources/templates/helpers/header.ftl b/src/main/resources/templates/helpers/header.ftl
index 43f298f356ce62c09911cbb356e8c69ceeda7d90..7f47dad84cfb45a59c7b3696d146be5454a1159a 100644
--- a/src/main/resources/templates/helpers/header.ftl
+++ b/src/main/resources/templates/helpers/header.ftl
@@ -93,11 +93,12 @@
     </div>
 </#macro>
 
-<#macro buttonLink url icon localizationKey id="" color="background-blue" classes="" isDataUrl=false noUrl=false>
+<#macro buttonLink url icon localizationKey id="" color="background-blue" classes="" isDataUrl=false noUrl=false disabled=false>
     <a <#if !isDataUrl && !noUrl>href="<@s.url url/>"</#if>
        id="${id}"
        class="waves-effect waves-light btn ${color} ${classes}"
-        <#if isDataUrl>data-url="${url}"</#if>>
+        <#if isDataUrl>data-url="${url}"</#if>
+        <#if disabled>disabled</#if>>
         <i class="material-icons left <#if !localizationKey?has_content>no-margin</#if>">${icon}</i><#if localizationKey?has_content>${locale.getString(localizationKey)}</#if>
     </a>
 </#macro>
diff --git a/src/main/resources/templates/helpers/imageSelect.ftl b/src/main/resources/templates/helpers/imageSelect.ftl
index d19e68f5fa8349b5752c3777231a9b4ecf9587ec..f4cd497f1d5581703d292cdca4be71c7b439001a 100644
--- a/src/main/resources/templates/helpers/imageSelect.ftl
+++ b/src/main/resources/templates/helpers/imageSelect.ftl
@@ -47,7 +47,7 @@
         </div>
         <div class="modal-footer background-color">
             <@header.buttonLink url='' icon='clear' localizationKey='cancel' color='red' classes='modal-action modal-close text-white' noUrl=true/>
-            <@header.buttonLink url='' icon='done' id='button-icon-confirm' localizationKey='ok' color='green' classes='modal-action modal-close text-white' noUrl=true/>
+            <@header.buttonLink url='' icon='done' id='button-icon-confirm' localizationKey='ok' color='green' classes='modal-action modal-close text-white' noUrl=true disabled=true/>
         </div>
     </div>
 </#macro>