diff --git a/chrome/content/zotero/elements/itemBox.js b/chrome/content/zotero/elements/itemBox.js
index b07234f7b9..6b9b3bec68 100644
--- a/chrome/content/zotero/elements/itemBox.js
+++ b/chrome/content/zotero/elements/itemBox.js
@@ -73,7 +73,7 @@
 									<menuitem id="zotero-creator-move-down" class="zotero-creator-move" data-l10n-id="item-creator-moveDown"/>
 								</menupopup>
 								<menupopup id="zotero-link-menu">
-									<menuitem id="zotero-link-menu-view-online" label="&zotero.item.viewOnline;"/>
+									<menuitem id="zotero-link-menu-view-online" data-l10n-id="item-menu-option-view-online"/>
 									<menuitem id="zotero-link-menu-copy" label="&zotero.item.copyAsURL;"/>
 								</menupopup>
 								<guidance-panel id="zotero-author-guidance" about="authorMenu" position="after_end" x="-25"/>
@@ -597,7 +597,7 @@
 				if ((fieldName == 'url' || fieldName == 'homepage')
 						// Only make plausible HTTP URLs clickable
 						&& Zotero.Utilities.isHTTPURL(val, true)) {
-					openLinkButton = this.createOpenLinkIcon(rowLabel, val);
+					openLinkButton = this.createOpenLinkIcon(val);
 					addContextMenu = true;
 				}
 				else if (fieldName == 'DOI' && val && typeof val == 'string') {
@@ -611,7 +611,7 @@
 								.replace(/\?/g, '%3f')
 								.replace(/%/g, '%25')
 								.replace(/"/g, '%22');
-						openLinkButton = this.createOpenLinkIcon(rowLabel, doi);
+						openLinkButton = this.createOpenLinkIcon(doi);
 						addContextMenu = true;
 					}
 				}
@@ -1026,7 +1026,7 @@
 			var removeButton = document.createXULElement('toolbarbutton');
 			removeButton.setAttribute("class", "zotero-clicky zotero-clicky-minus show-on-hover no-display");
 			removeButton.setAttribute('ztabindex', ++this._ztabindex);
-			removeButton.setAttribute('aria-label', Zotero.getString('general.delete'));
+			removeButton.setAttribute('tooltiptext', Zotero.getString('general.delete'));
 			// If default first row, don't let user remove it
 			if (defaultRow || !this.editable) {
 				this.disableButton(removeButton);
@@ -1042,6 +1042,7 @@
 			var addButton = document.createXULElement('toolbarbutton');
 			addButton.setAttribute("class", "zotero-clicky zotero-clicky-plus show-on-hover no-display");
 			addButton.setAttribute('ztabindex', ++this._ztabindex);
+			addButton.setAttribute('tooltiptext', Zotero.getString('general.create'));
 			// If row isn't saved, don't let user add more
 			if (unsaved || !this.editable) {
 				this.disableButton(addButton);
@@ -1445,7 +1446,7 @@
 			}
 		}
 		
-		createOpenLinkIcon(rowLabel, value) {
+		createOpenLinkIcon(value) {
 			// In duplicates/trash mode return nothing
 			if (!this.editable) {
 				return null;
@@ -1454,9 +1455,8 @@
 			openLink.className = "zotero-clicky zotero-clicky-open-link show-on-hover";
 			openLink.addEventListener("click", event => ZoteroPane.loadURI(value, event));
 			openLink.addEventListener('keypress', event => this.handleKeyPress(event));
-			rowLabel.setAttribute('title', Zotero.getString('pane.item.viewOnline.tooltip'));
 			openLink.setAttribute("ztabindex", ++this._ztabindex);
-			openLink.setAttribute('data-l10n-id', "itembox-button-openLink");
+			openLink.setAttribute('data-l10n-id', "item-button-view-online");
 			return openLink;
 		}
 
diff --git a/chrome/locale/en-US/zotero/zotero.dtd b/chrome/locale/en-US/zotero/zotero.dtd
index 411873cbc3..3ed5249249 100644
--- a/chrome/locale/en-US/zotero/zotero.dtd
+++ b/chrome/locale/en-US/zotero/zotero.dtd
@@ -112,7 +112,6 @@
 <!ENTITY zotero.item.textTransform.sentencecase			"Sentence case">
 <!ENTITY zotero.item.creatorTransform.nameSwap      	"Swap First/Last">
 <!ENTITY zotero.item.creatorTransform.fixCase         "Fix Case">
-<!ENTITY zotero.item.viewOnline							"View Online">
 <!ENTITY zotero.item.copyAsURL							"Copy as URL">
 <!ENTITY zotero.item.deletePermanently                 "Delete Permanently…">
 
diff --git a/chrome/locale/en-US/zotero/zotero.ftl b/chrome/locale/en-US/zotero/zotero.ftl
index 7295ad7c47..7f1962ef18 100644
--- a/chrome/locale/en-US/zotero/zotero.ftl
+++ b/chrome/locale/en-US/zotero/zotero.ftl
@@ -67,13 +67,14 @@ item-menu-add-linked-file =
 item-menu-add-url =
      .label = Web Link
 
-itembox-button-openLink =
-    .title = Open Link
-    .aria-label = Open Link
+view-online = View Online
+item-menu-option-view-online =
+    .label = {view-online}
+item-button-view-online =
+    .tooltiptext = {view-online}
 
 itembox-button-options =
-    .aria-label = Open Context Menu
-    .title = Open Context Menu
+    .tooltiptext = Open Context Menu
 
 import-window =
     .title = Import
diff --git a/chrome/locale/en-US/zotero/zotero.properties b/chrome/locale/en-US/zotero/zotero.properties
index 83ac9e3610..3b11a4e37f 100644
--- a/chrome/locale/en-US/zotero/zotero.properties
+++ b/chrome/locale/en-US/zotero/zotero.properties
@@ -449,7 +449,6 @@ pane.item.tags.icon.user = User-added tag
 pane.item.tags.icon.automatic = Automatically added tag
 pane.item.tags.removeAll = Remove all tags from this item?
 pane.item.parentItem			= Parent Item:
-pane.item.viewOnline.tooltip	= Go to this item online
 
 pane.context.noParent			= No parent item
 pane.context.itemNotes			= Item Notes