diff --git a/plugins/Favourite/Favourite.php b/plugins/Favourite/Favourite.php
index 28eb6e2bb2..6b5be8a28d 100644
--- a/plugins/Favourite/Favourite.php
+++ b/plugins/Favourite/Favourite.php
@@ -36,6 +36,7 @@ use App\Util\Nickname;
 use Symfony\Component\Form\Extension\Core\Type\HiddenType;
 use Symfony\Component\Form\Extension\Core\Type\SubmitType;
 use Symfony\Component\HttpFoundation\Request;
+use function App\Core\I18n\_m;
 
 class Favourite extends NoteHandlerPlugin
 {
@@ -65,7 +66,7 @@ class Favourite extends NoteHandlerPlugin
         $form_fav = Form::create([
             ['submit_favourite', SubmitType::class,
                 [
-                    'label' => ' ',
+                    'label' => $is_set ? _m('Note already favourite!.') : _m('Favourite this note.'),
                     'attr'  => [
                         'class' => $is_set ? 'note-actions-set' : 'note-actions-unset',
                     ],
diff --git a/public/assets/css/base.css b/public/assets/css/base.css
index 9dda316fb3..916eda57fc 100644
--- a/public/assets/css/base.css
+++ b/public/assets/css/base.css
@@ -320,6 +320,9 @@ summary:hover .icon-details-open {
 }
 
 .favourite-button-container button {
+    text-indent: -9999em;
+    text-transform: uppercase;
+
     -webkit-mask-image: url("../icons/heart.svg") !important;
     -o-mask-image: url("../icons/heart.svg") !important;
     -moz-mask-image: url("../icons/heart.svg") !important;
diff --git a/templates/note/view.html.twig b/templates/note/view.html.twig
index 922594e18d..9cfd658bae 100644
--- a/templates/note/view.html.twig
+++ b/templates/note/view.html.twig
@@ -22,7 +22,8 @@
                 {% for current_action in get_note_actions(note) %}
                     {{ form_start(current_action) }}
                         {% if current_action.submit_favourite is defined %}
-                            <span title="Favourite this note." class="button-container favourite-button-container">
+                            <span title="Favourite this note." class="button-container favourite-button-container"
+                                {% if current_action.submit_favourite is defined %}{% endif %}>
                                 {{ form_widget(current_action.submit_favourite) }}
                             </span>
                         {% endif %}