diff --git a/web/styles/compose.css b/web/styles/compose.css
index af30c35ca3..df8cef8f52 100644
--- a/web/styles/compose.css
+++ b/web/styles/compose.css
@@ -83,13 +83,6 @@
     opacity: 1;
 }
 
-.narrow_to_compose_recipient_current_view_help {
-    margin: 0;
-    white-space: nowrap;
-    overflow: hidden;
-    text-overflow: ellipsis;
-}
-
 .compose_table {
     height: 100%;
     display: flex;
diff --git a/web/templates/buddy_list_tooltip_content.hbs b/web/templates/buddy_list_tooltip_content.hbs
index 4aa23fb9b0..cb53e8201b 100644
--- a/web/templates/buddy_list_tooltip_content.hbs
+++ b/web/templates/buddy_list_tooltip_content.hbs
@@ -1,14 +1,14 @@
 <div class="buddy_list_tooltip_content">
-    <span>
+    <div>
         {{first_line}}
         {{#if show_you}}
         <span class="my_user_status">{{t "(you)" }}</span>
         {{/if}}
-    </span>
+    </div>
     {{#if second_line}}
-    <br /><span class="tooltip-inner-content">{{second_line}}</span>
+        <div class="tooltip-inner-content">{{second_line}}</div>
     {{/if}}
     {{#if third_line}}
-    <br /><span class="tooltip-inner-content">{{third_line}}</span>
+        <div class="tooltip-inner-content">{{third_line}}</div>
     {{/if}}
 </div>
diff --git a/web/templates/change_visibility_policy_button_tooltip.hbs b/web/templates/change_visibility_policy_button_tooltip.hbs
index 58cb4c02b5..e96e63d175 100644
--- a/web/templates/change_visibility_policy_button_tooltip.hbs
+++ b/web/templates/change_visibility_policy_button_tooltip.hbs
@@ -1,5 +1,4 @@
 <div id="change_visibility_policy_button_tooltip">
     <strong>{{current_visibility_policy_str}}</strong>
-    <br/>
-    <span class="tooltip-inner-content italic">{{t 'Click to change notifications for this topic.' }}</span>
+    <div class="tooltip-inner-content italic">{{t 'Click to change notifications for this topic.' }}</div>
 </div>
diff --git a/web/templates/message_edit_notice_tooltip.hbs b/web/templates/message_edit_notice_tooltip.hbs
index f366a970bb..21697e95f8 100644
--- a/web/templates/message_edit_notice_tooltip.hbs
+++ b/web/templates/message_edit_notice_tooltip.hbs
@@ -1,6 +1,6 @@
 <div>
     <div>{{edited_notice_str}}</div>
     {{#if realm_allow_edit_history}}
-        <i>{{t 'Click to view edit history.' }}</i>
+        <div class="tooltip-inner-content italic">{{t 'Click to view edit history.' }}</div>
     {{/if}}
 </div>
diff --git a/web/templates/message_inline_image_tooltip.hbs b/web/templates/message_inline_image_tooltip.hbs
index 27dc83295b..6d7efe70d8 100644
--- a/web/templates/message_inline_image_tooltip.hbs
+++ b/web/templates/message_inline_image_tooltip.hbs
@@ -1,5 +1,4 @@
 <div id="message_inline_image_tooltip">
     <strong>{{ title }}</strong>
-    <br/>
-    <span class="tooltip-inner-content italic">{{t 'Click to view or download.'}}</span>
+    <div class="tooltip-inner-content italic">{{t 'Click to view or download.'}}</div>
 </div>
diff --git a/web/templates/narrow_to_compose_recipients_tooltip.hbs b/web/templates/narrow_to_compose_recipients_tooltip.hbs
index 94685a6f67..4d1c0e6eef 100644
--- a/web/templates/narrow_to_compose_recipients_tooltip.hbs
+++ b/web/templates/narrow_to_compose_recipients_tooltip.hbs
@@ -1,7 +1,7 @@
 <div>
-    <span>{{t 'Go to conversation' }}</span>
+    <div>{{t "Go to conversation"}}</div>
     {{#if display_current_view}}
-    <p class="narrow_to_compose_recipient_current_view_help tooltip-inner-content italic">{{display_current_view}}</p>
+        <div class="tooltip-inner-content italic">{{display_current_view}}</div>
     {{/if}}
 </div>
 {{tooltip_hotkey_hints "Ctrl" "."}}
diff --git a/web/templates/tooltip_templates.hbs b/web/templates/tooltip_templates.hbs
index dfaafec924..ea75cec12b 100644
--- a/web/templates/tooltip_templates.hbs
+++ b/web/templates/tooltip_templates.hbs
@@ -55,8 +55,8 @@
 </template>
 <template id="add-global-time-tooltip">
     <div>
-        <span>{{t "Add global time" }}</span><br/>
-        <span class="tooltip-inner-content italic">{{t "Everyone sees global times in their own time zone." }}</span>
+        <div>{{t "Add global time" }}</div>
+        <div class="tooltip-inner-content italic">{{t "Everyone sees global times in their own time zone." }}</div>
     </div>
 </template>
 <template id="delete-draft-tooltip-template">
@@ -124,11 +124,11 @@
     {{tooltip_hotkey_hints "I"}}
 </template>
 <template id="star-message-tooltip-template">
-    <span class="starred-status">{{t "Star this message" }}</span>
+    <div class="starred-status">{{t "Star this message" }}</div>
     {{tooltip_hotkey_hints "Ctrl" "S"}}
 </template>
 <template id="unstar-message-tooltip-template">
-    <span class="starred-status">{{t "Unstar this message" }}</span>
+    <div class="starred-status">{{t "Unstar this message" }}</div>
     {{tooltip_hotkey_hints "Ctrl" "S"}}
 </template>
 <template id="search-query-tooltip-template">