diff --git a/app/views/accounts/show.html.erb b/app/views/accounts/show.html.erb
index 7a79c0cf..67019274 100644
--- a/app/views/accounts/show.html.erb
+++ b/app/views/accounts/show.html.erb
@@ -54,7 +54,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('force_2fa_with_authenticator_app') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('require_two_factor_authentication_2fa_with_an_authenticator_app_e_g_google_authenticator_authy_all_users_signing_documents_must_pass_the_second_factor_verification_using_a_secure_code_in_addition_to_their_password') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <submit-form data-on="change" class="flex">
@@ -71,7 +71,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('add_signature_id_to_the_documents') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('add_a_unique_signature_id_and_timestamp_to_each_signature_for_audit_and_traceability_purposes_along_with_the_timestamp_part_of_docuseals_21_cfr_part_11_compliance_settings') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <submit-form data-on="change" class="flex">
@@ -88,7 +88,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('require_signing_reason') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('require_signer_to_provide_a_reason_for_signing_before_completing_their_signature_e_g_approvals_certifications_part_of_docuseals_21_cfr_part_11_compliance_settings') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <submit-form data-on="change" class="flex">
@@ -105,7 +105,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('allow_typed_text_signatures') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('allow_signers_to_create_signatures_by_typing_their_name_instead_of_drawing_or_uploading_one') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <submit-form data-on="change" class="flex">
@@ -122,7 +122,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('allow_to_resubmit_completed_forms') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('allow_signers_to_resubmit_forms_after_completion_useful_when_corrections_or_multiple_submissions_are_needed') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <submit-form data-on="change" class="flex">
@@ -139,7 +139,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('allow_to_decline_documents') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('allow_recipients_to_decline_signing_a_document_the_decline_reason_notification_will_be_sent_to_the_signature_requester') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <% if !Docuseal.multitenant? || can?(:manage, :disable_decline) %>
@@ -162,7 +162,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('allow_to_delegate_documents') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('allow_recipients_to_delegate_documents') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <% if !Docuseal.multitenant? || can?(:manage, :delegate_form) %>
@@ -185,7 +185,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('remember_and_pre_fill_signatures') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('save_a_users_signature_and_automatically_pre_fill_it_in_future_signing_sessions') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <submit-form data-on="change" class="flex">
@@ -202,7 +202,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('expirable_file_download_links') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('make_document_download_links_expire_after_40_minutes_to_prevent_long_term_access_and_enhance_security') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <submit-form data-on="change" class="flex">
@@ -219,7 +219,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('require_authentication_for_file_download_links') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('require_authentication_with_user_login_or_api_key_to_access_the_document_download_links') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <submit-form data-on="change" class="flex">
@@ -236,7 +236,7 @@
               <div class="flex items-center space-x-1">
                 <span class="text-left"><%= t('combine_completed_documents_and_audit_log') %></span>
                 <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('combine_signed_documents_and_the_audit_log_into_a_single_pdf_file_for_easier_recordkeeping_and_compliance') %>">
-                  <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                  <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                 </span>
               </div>
               <submit-form data-on="change" class="flex">
@@ -254,7 +254,7 @@
                 <div class="flex items-center space-x-1">
                   <span class="text-left"><%= t('always_enforce_signing_order') %></span>
                   <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('make_the_recipients_signing_order_always_enforced_so_that_the_second_signer_can_start_signing_their_part_only_after_the_first_signer_has_completed_signing') %>">
-                    <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+                    <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
                   </span>
                 </div>
                 <submit-form data-on="change" class="flex">
diff --git a/app/views/dashboard/_toggle_view.html.erb b/app/views/dashboard/_toggle_view.html.erb
index 54836506..29bbb8fc 100644
--- a/app/views/dashboard/_toggle_view.html.erb
+++ b/app/views/dashboard/_toggle_view.html.erb
@@ -1,10 +1,10 @@
 <form action="<%= root_path %>" method="get" id="templates_submissions_toggle" class="bg-base-200 px-1.5 rounded-xl py-1 whitespace-nowrap">
-  <toggle-cookies data-value="templates" data-key="dashboard_view" class="sm:tooltip tooltip-top tooltip-no-touch" data-tip="<%= t('templates') %>">
+  <toggle-cookies data-value="templates" data-key="dashboard_view" class="tooltip tooltip-top tooltip-no-touch" data-tip="<%= t('templates') %>">
     <button class="<%= local_assigns[:selected] == 'submissions' ? 'btn !border !rounded-lg btn-square !p-0 !btn-sm !h-8 !w-9' : 'btn btn-neutral !rounded-lg btn-square !p-0 hover:text-neutral-300 !btn-sm !h-8 !w-9 disabled:btn-neutral' %>">
       <%= svg_icon('layout_grid', class: 'w-6 h-6 stroke-2') %>
     </button>
   </toggle-cookies>
-  <toggle-cookies data-value="submissions" data-key="dashboard_view" class="sm:tooltip tooltip-top tooltip-no-touch" data-tip="<%= t('submissions') %>">
+  <toggle-cookies data-value="submissions" data-key="dashboard_view" class="tooltip tooltip-top tooltip-no-touch" data-tip="<%= t('submissions') %>">
     <button class="<%= local_assigns[:selected] == 'submissions' ? 'btn btn-neutral !rounded-lg btn-square !p-0 hover:text-neutral-300 !btn-sm !h-8 !w-9' : 'btn !border !rounded-lg btn-square !p-0 !btn-sm !h-8 !w-9 disabled:btn-neutral' %>">
       <%= svg_icon('layout_list', class: 'w-6 h-6 stroke-2') %>
     </button>
diff --git a/app/views/mcp_settings/index.html.erb b/app/views/mcp_settings/index.html.erb
index d0e5c46b..bb27bbc8 100644
--- a/app/views/mcp_settings/index.html.erb
+++ b/app/views/mcp_settings/index.html.erb
@@ -99,7 +99,7 @@
           <div class="flex items-center space-x-1">
             <span class="text-left"><%= t('enable_mcp_server') %></span>
             <span class="tooltip tooltip-top hidden md:flex cursor-pointer" data-tip="<%= t('all_existing_mcp_connections_will_be_stopped_immediately_when_this_setting_is_disabled') %>">
-              <%= svg_icon('info_circle', class: 'hidden md:inline-block w-4 h-4 shrink-0') %>
+              <%= svg_icon('info_circle', class: 'w-4 h-4 shrink-0') %>
             </span>
           </div>
           <submit-form data-on="change" class="flex">
diff --git a/app/views/shared/_navbar.html.erb b/app/views/shared/_navbar.html.erb
index f772d94a..fce7a2ee 100644
--- a/app/views/shared/_navbar.html.erb
+++ b/app/views/shared/_navbar.html.erb
@@ -34,7 +34,7 @@
               <span class="mr-1"><%= t('settings') %></span>
             <% end %>
           </li>
-          <li class="hidden md:flex">
+          <li class="hidden md:list-item">
             <%= link_to settings_profile_index_path, class: 'flex items-center' do %>
               <%= svg_icon('adjustments', class: 'w-5 h-5 flex-shrink-0 stroke-2') %>
               <span class="mr-1"><%= t('profile') %></span>
diff --git a/app/views/templates/_submission.html.erb b/app/views/templates/_submission.html.erb
index 8ac88786..e0a7acab 100644
--- a/app/views/templates/_submission.html.erb
+++ b/app/views/templates/_submission.html.erb
@@ -102,12 +102,12 @@
           </a>
         </div>
         <% if !submission.archived_at? && !template&.archived_at? && can?(:destroy, submission) %>
-          <span data-tip="<%= t('archive') %>" class="sm:tooltip tooltip-top tooltip-no-touch">
+          <span data-tip="<%= t('archive') %>" class="tooltip tooltip-top tooltip-no-touch">
             <%= button_to button_title(title: nil, disabled_with: nil, icon: svg_icon('archive', class: 'w-6 h-6'), icon_disabled: svg_icon('loader', class: 'w-6 h-6 animate-spin')), submission_path(submission), class: 'btn btn-outline btn-sm w-full md:w-fit', form: { class: 'flex' }, title: t('archive'), method: :delete %>
           </span>
         <% end %>
         <% if local_assigns[:archived] && can?(:destroy, submission) %>
-          <span data-tip="<%= t('remove') %>" class="sm:tooltip tooltip-top tooltip-no-touch">
+          <span data-tip="<%= t('remove') %>" class="tooltip tooltip-top tooltip-no-touch">
             <%= button_to button_title(title: nil, disabled_with: nil, icon: svg_icon('trash', class: 'w-6 h-6'), icon_disabled: svg_icon('loader', class: 'w-6 h-6 animate-spin')), submission_path(submission, permanently: true), class: 'btn btn-outline btn-sm w-full md:w-fit', form: { class: 'flex' }, title: t('remove'), method: :delete, data: { turbo_confirm: t('submission_deletion_is_irreversible_and_will_permanently_remove_all_associated_signed_documents_with_it_are_you_sure_') } %>
           </span>
         <% end %>
@@ -209,12 +209,12 @@
           </a>
         </div>
         <% if !submission.archived_at? && !template&.archived_at? %>
-          <span data-tip="<%= t('archive') %>" class="sm:tooltip tooltip-top tooltip-no-touch">
+          <span data-tip="<%= t('archive') %>" class="tooltip tooltip-top tooltip-no-touch">
             <%= button_to button_title(title: nil, disabled_with: nil, icon: svg_icon('archive', class: 'w-6 h-6'), icon_disabled: svg_icon('loader', class: 'w-6 h-6 animate-spin')), submission_path(submission), class: 'btn btn-outline btn-sm w-full md:w-fit', form: { class: 'flex' }, title: t('archive'), method: :delete %>
           </span>
         <% end %>
         <% if local_assigns[:archived] && can?(:destroy, submission) %>
-          <span data-tip="<%= t('remove') %>" class="sm:tooltip tooltip-top tooltip-no-touch">
+          <span data-tip="<%= t('remove') %>" class="tooltip tooltip-top tooltip-no-touch">
             <%= button_to button_title(title: nil, disabled_with: nil, icon: svg_icon('trash', class: 'w-6 h-6'), icon_disabled: svg_icon('loader', class: 'w-6 h-6 animate-spin')), submission_path(submission, permanently: true), class: 'btn btn-outline btn-sm w-full md:w-fit', form: { class: 'flex' }, title: t('remove'), method: :delete, data: { turbo_confirm: t('submission_deletion_is_irreversible_and_will_permanently_remove_all_associated_signed_documents_with_it_are_you_sure_') } %>
           </span>
         <% end %>