diff --git a/src/components/alphaPicker/alphaPicker.js b/src/components/alphaPicker/alphaPicker.js
index 1579ef71cc..ac484bbf1c 100644
--- a/src/components/alphaPicker/alphaPicker.js
+++ b/src/components/alphaPicker/alphaPicker.js
@@ -8,6 +8,7 @@
import focusManager from '../focusManager';
import layoutManager from '../layoutManager';
import dom from '../../scripts/dom';
+import globalize from '../../scripts/globalize';
import './style.scss';
import '../../elements/emby-button/paper-icon-button-light';
import 'material-design-icons-iconfont';
@@ -75,7 +76,7 @@ import 'material-design-icons-iconfont';
html += `
`;
if (options.mode === 'keyboard') {
- html += ``;
+ html += ``;
} else {
letters = ['#'];
html += mapLetters(letters, vertical).join('');
@@ -85,7 +86,7 @@ import 'material-design-icons-iconfont';
html += mapLetters(letters, vertical).join('');
if (options.mode === 'keyboard') {
- html += ``;
+ html += ``;
html += '
';
letters = ['0', '1', '2', '3', '4', '5', '6', '7', '8', '9'];
diff --git a/src/components/cardbuilder/cardBuilder.js b/src/components/cardbuilder/cardBuilder.js
index 9d1b9d1205..c2300fb2d8 100644
--- a/src/components/cardbuilder/cardBuilder.js
+++ b/src/components/cardbuilder/cardBuilder.js
@@ -1344,8 +1344,10 @@ import ServerConnections from '../ServerConnections';
cardImageContainerClose = '';
} else {
+ const cardImageContainerAriaLabelAttribute = ` aria-label="${item.Name}"`;
+
// Don't use the IMG tag with safari because it puts a white border around it
- cardImageContainerOpen = imgUrl ? ('