diff --git a/__tests__/components/viewers/__snapshots__/stop-viewer.js.snap b/__tests__/components/viewers/__snapshots__/stop-viewer.js.snap
index b4051bdf3..d79961eb0 100644
--- a/__tests__/components/viewers/__snapshots__/stop-viewer.js.snap
+++ b/__tests__/components/viewers/__snapshots__/stop-viewer.js.snap
@@ -392,7 +392,7 @@ exports[`components > viewers > stop viewer should render countdown times after
                         >
                           <Styled(styled.span)>
                             <span
-                              className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                              className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                             >
                               <ArrowLeft>
                                 <StyledIconBase
@@ -518,7 +518,7 @@ exports[`components > viewers > stop viewer should render countdown times after
                           }
                         >
                           <span
-                            className="sc-gHfsNP fqEECF"
+                            className="sc-dkAqVg dwdQnb"
                             style={
                               Object {
                                 "marginLeft": "0.2em",
@@ -594,7 +594,7 @@ exports[`components > viewers > stop viewer should render countdown times after
                         >
                           <Styled(styled.span)>
                             <span
-                              className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                              className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                             >
                               <Calendar>
                                 <StyledIconBase
@@ -680,11 +680,11 @@ exports[`components > viewers > stop viewer should render countdown times after
                                   size="0.9em"
                                 >
                                   <DotCircle
-                                    className="sc-gsBqHK hwGZTJ"
+                                    className="sc-aKXVD bNLtzV"
                                     size="0.9em"
                                   >
                                     <StyledIconBase
-                                      className="sc-gsBqHK hwGZTJ"
+                                      className="sc-aKXVD bNLtzV"
                                       iconAttrs={
                                         Object {
                                           "fill": "currentColor",
@@ -696,7 +696,7 @@ exports[`components > viewers > stop viewer should render countdown times after
                                       size="0.9em"
                                     >
                                       <ForwardRef
-                                        className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-gsBqHK hwGZTJ"
+                                        className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-aKXVD bNLtzV"
                                         iconAttrs={
                                           Object {
                                             "fill": "currentColor",
@@ -709,7 +709,7 @@ exports[`components > viewers > stop viewer should render countdown times after
                                       >
                                         <svg
                                           aria-hidden="true"
-                                          className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-gsBqHK hwGZTJ"
+                                          className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-aKXVD bNLtzV"
                                           fill="currentColor"
                                           focusable="false"
                                           height="0.9em"
@@ -757,11 +757,11 @@ exports[`components > viewers > stop viewer should render countdown times after
                                   size="0.9em"
                                 >
                                   <MapMarkerAlt
-                                    className="sc-kmATbt iZcPLE"
+                                    className="sc-cvJIAo esTqCF"
                                     size="0.9em"
                                   >
                                     <StyledIconBase
-                                      className="sc-kmATbt iZcPLE"
+                                      className="sc-cvJIAo esTqCF"
                                       iconAttrs={
                                         Object {
                                           "fill": "currentColor",
@@ -773,7 +773,7 @@ exports[`components > viewers > stop viewer should render countdown times after
                                       size="0.9em"
                                     >
                                       <ForwardRef
-                                        className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-kmATbt iZcPLE"
+                                        className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-cvJIAo esTqCF"
                                         iconAttrs={
                                           Object {
                                             "fill": "currentColor",
@@ -786,7 +786,7 @@ exports[`components > viewers > stop viewer should render countdown times after
                                       >
                                         <svg
                                           aria-hidden="true"
-                                          className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-kmATbt iZcPLE"
+                                          className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-cvJIAo esTqCF"
                                           fill="currentColor"
                                           focusable="false"
                                           height="0.9em"
@@ -830,7 +830,7 @@ exports[`components > viewers > stop viewer should render countdown times after
                   tabIndex={0}
                 >
                   <div
-                    className="sc-eisiLS hQlWAk"
+                    className="sc-dkaWRx gpzDui"
                     tabIndex={0}
                   >
                     <injectIntl(LiveStopTimes)
@@ -1380,7 +1380,7 @@ exports[`components > viewers > stop viewer should render countdown times after
                                         title="20"
                                       >
                                         <span
-                                          className="sc-jvfqPk drpPnJ"
+                                          className="sc-edoYdd cUdUnS"
                                           color="333333"
                                           style={
                                             Object {
@@ -1442,7 +1442,7 @@ exports[`components > viewers > stop viewer should render countdown times after
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -1556,7 +1556,7 @@ exports[`components > viewers > stop viewer should render countdown times after
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -1612,7 +1612,7 @@ exports[`components > viewers > stop viewer should render countdown times after
                                         >
                                           <styled.span>
                                             <span
-                                              className="sc-edoYdd hROHGP"
+                                              className="sc-jlIlqL fflrIy"
                                             >
                                               <FormattedDayOfWeek
                                                 day="wednesday"
@@ -1699,7 +1699,7 @@ exports[`components > viewers > stop viewer should render countdown times after
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -1755,7 +1755,7 @@ exports[`components > viewers > stop viewer should render countdown times after
                                         >
                                           <styled.span>
                                             <span
-                                              className="sc-edoYdd hROHGP"
+                                              className="sc-jlIlqL fflrIy"
                                             >
                                               <FormattedDayOfWeek
                                                 day="wednesday"
@@ -1827,7 +1827,7 @@ exports[`components > viewers > stop viewer should render countdown times after
                               margin={0.25}
                             >
                               <span
-                                className="sc-hkwmXC klpVwE"
+                                className="sc-bSFUlv gNUAmm"
                               >
                                 <input
                                   defaultChecked={true}
@@ -1883,7 +1883,7 @@ exports[`components > viewers > stop viewer should render countdown times after
                                   spin={true}
                                 >
                                   <span
-                                    className="sc-gHfsNP sc-dkAqVg jdSbUo gBWSYK"
+                                    className="sc-dkAqVg sc-jifHHV ctpxjy czUBjn"
                                   >
                                     <Redo>
                                       <StyledIconBase
@@ -2679,7 +2679,7 @@ exports[`components > viewers > stop viewer should render countdown times after
                                           >
                                             <div
                                               aria-hidden={true}
-                                              className="sc-bSFUlv knrmPL"
+                                              className="sc-jvfqPk gVipSr"
                                             >
                                               P
                                             </div>
@@ -3005,7 +3005,7 @@ exports[`components > viewers > stop viewer should render countdown times for st
                         >
                           <Styled(styled.span)>
                             <span
-                              className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                              className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                             >
                               <ArrowLeft>
                                 <StyledIconBase
@@ -3131,7 +3131,7 @@ exports[`components > viewers > stop viewer should render countdown times for st
                           }
                         >
                           <span
-                            className="sc-gHfsNP fqEECF"
+                            className="sc-dkAqVg dwdQnb"
                             style={
                               Object {
                                 "marginLeft": "0.2em",
@@ -3207,7 +3207,7 @@ exports[`components > viewers > stop viewer should render countdown times for st
                         >
                           <Styled(styled.span)>
                             <span
-                              className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                              className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                             >
                               <Calendar>
                                 <StyledIconBase
@@ -3293,11 +3293,11 @@ exports[`components > viewers > stop viewer should render countdown times for st
                                   size="0.9em"
                                 >
                                   <DotCircle
-                                    className="sc-gsBqHK hwGZTJ"
+                                    className="sc-aKXVD bNLtzV"
                                     size="0.9em"
                                   >
                                     <StyledIconBase
-                                      className="sc-gsBqHK hwGZTJ"
+                                      className="sc-aKXVD bNLtzV"
                                       iconAttrs={
                                         Object {
                                           "fill": "currentColor",
@@ -3309,7 +3309,7 @@ exports[`components > viewers > stop viewer should render countdown times for st
                                       size="0.9em"
                                     >
                                       <ForwardRef
-                                        className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-gsBqHK hwGZTJ"
+                                        className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-aKXVD bNLtzV"
                                         iconAttrs={
                                           Object {
                                             "fill": "currentColor",
@@ -3322,7 +3322,7 @@ exports[`components > viewers > stop viewer should render countdown times for st
                                       >
                                         <svg
                                           aria-hidden="true"
-                                          className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-gsBqHK hwGZTJ"
+                                          className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-aKXVD bNLtzV"
                                           fill="currentColor"
                                           focusable="false"
                                           height="0.9em"
@@ -3370,11 +3370,11 @@ exports[`components > viewers > stop viewer should render countdown times for st
                                   size="0.9em"
                                 >
                                   <MapMarkerAlt
-                                    className="sc-kmATbt iZcPLE"
+                                    className="sc-cvJIAo esTqCF"
                                     size="0.9em"
                                   >
                                     <StyledIconBase
-                                      className="sc-kmATbt iZcPLE"
+                                      className="sc-cvJIAo esTqCF"
                                       iconAttrs={
                                         Object {
                                           "fill": "currentColor",
@@ -3386,7 +3386,7 @@ exports[`components > viewers > stop viewer should render countdown times for st
                                       size="0.9em"
                                     >
                                       <ForwardRef
-                                        className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-kmATbt iZcPLE"
+                                        className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-cvJIAo esTqCF"
                                         iconAttrs={
                                           Object {
                                             "fill": "currentColor",
@@ -3399,7 +3399,7 @@ exports[`components > viewers > stop viewer should render countdown times for st
                                       >
                                         <svg
                                           aria-hidden="true"
-                                          className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-kmATbt iZcPLE"
+                                          className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-cvJIAo esTqCF"
                                           fill="currentColor"
                                           focusable="false"
                                           height="0.9em"
@@ -3443,7 +3443,7 @@ exports[`components > viewers > stop viewer should render countdown times for st
                   tabIndex={0}
                 >
                   <div
-                    className="sc-eisiLS hQlWAk"
+                    className="sc-dkaWRx gpzDui"
                     tabIndex={0}
                   >
                     <injectIntl(LiveStopTimes)
@@ -3773,7 +3773,7 @@ exports[`components > viewers > stop viewer should render countdown times for st
                                         title="20"
                                       >
                                         <span
-                                          className="sc-jvfqPk drpPnJ"
+                                          className="sc-edoYdd cUdUnS"
                                           color="333333"
                                           style={
                                             Object {
@@ -3835,7 +3835,7 @@ exports[`components > viewers > stop viewer should render countdown times for st
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -3934,7 +3934,7 @@ exports[`components > viewers > stop viewer should render countdown times for st
                               margin={0.25}
                             >
                               <span
-                                className="sc-hkwmXC klpVwE"
+                                className="sc-bSFUlv gNUAmm"
                               >
                                 <input
                                   defaultChecked={true}
@@ -3990,7 +3990,7 @@ exports[`components > viewers > stop viewer should render countdown times for st
                                   spin={true}
                                 >
                                   <span
-                                    className="sc-gHfsNP sc-dkAqVg jdSbUo gBWSYK"
+                                    className="sc-dkAqVg sc-jifHHV ctpxjy czUBjn"
                                   >
                                     <Redo>
                                       <StyledIconBase
@@ -4390,7 +4390,7 @@ exports[`components > viewers > stop viewer should render countdown times for st
                                           >
                                             <div
                                               aria-hidden={true}
-                                              className="sc-bSFUlv knrmPL"
+                                              className="sc-jvfqPk gVipSr"
                                             >
                                               P
                                             </div>
@@ -4815,7 +4815,7 @@ exports[`components > viewers > stop viewer should render times after midnight w
                         >
                           <Styled(styled.span)>
                             <span
-                              className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                              className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                             >
                               <ArrowLeft>
                                 <StyledIconBase
@@ -4941,7 +4941,7 @@ exports[`components > viewers > stop viewer should render times after midnight w
                           }
                         >
                           <span
-                            className="sc-gHfsNP fqEECF"
+                            className="sc-dkAqVg dwdQnb"
                             style={
                               Object {
                                 "marginLeft": "0.2em",
@@ -5017,7 +5017,7 @@ exports[`components > viewers > stop viewer should render times after midnight w
                         >
                           <Styled(styled.span)>
                             <span
-                              className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                              className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                             >
                               <Calendar>
                                 <StyledIconBase
@@ -5103,11 +5103,11 @@ exports[`components > viewers > stop viewer should render times after midnight w
                                   size="0.9em"
                                 >
                                   <DotCircle
-                                    className="sc-gsBqHK hwGZTJ"
+                                    className="sc-aKXVD bNLtzV"
                                     size="0.9em"
                                   >
                                     <StyledIconBase
-                                      className="sc-gsBqHK hwGZTJ"
+                                      className="sc-aKXVD bNLtzV"
                                       iconAttrs={
                                         Object {
                                           "fill": "currentColor",
@@ -5119,7 +5119,7 @@ exports[`components > viewers > stop viewer should render times after midnight w
                                       size="0.9em"
                                     >
                                       <ForwardRef
-                                        className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-gsBqHK hwGZTJ"
+                                        className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-aKXVD bNLtzV"
                                         iconAttrs={
                                           Object {
                                             "fill": "currentColor",
@@ -5132,7 +5132,7 @@ exports[`components > viewers > stop viewer should render times after midnight w
                                       >
                                         <svg
                                           aria-hidden="true"
-                                          className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-gsBqHK hwGZTJ"
+                                          className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-aKXVD bNLtzV"
                                           fill="currentColor"
                                           focusable="false"
                                           height="0.9em"
@@ -5180,11 +5180,11 @@ exports[`components > viewers > stop viewer should render times after midnight w
                                   size="0.9em"
                                 >
                                   <MapMarkerAlt
-                                    className="sc-kmATbt iZcPLE"
+                                    className="sc-cvJIAo esTqCF"
                                     size="0.9em"
                                   >
                                     <StyledIconBase
-                                      className="sc-kmATbt iZcPLE"
+                                      className="sc-cvJIAo esTqCF"
                                       iconAttrs={
                                         Object {
                                           "fill": "currentColor",
@@ -5196,7 +5196,7 @@ exports[`components > viewers > stop viewer should render times after midnight w
                                       size="0.9em"
                                     >
                                       <ForwardRef
-                                        className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-kmATbt iZcPLE"
+                                        className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-cvJIAo esTqCF"
                                         iconAttrs={
                                           Object {
                                             "fill": "currentColor",
@@ -5209,7 +5209,7 @@ exports[`components > viewers > stop viewer should render times after midnight w
                                       >
                                         <svg
                                           aria-hidden="true"
-                                          className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-kmATbt iZcPLE"
+                                          className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-cvJIAo esTqCF"
                                           fill="currentColor"
                                           focusable="false"
                                           height="0.9em"
@@ -5253,7 +5253,7 @@ exports[`components > viewers > stop viewer should render times after midnight w
                   tabIndex={0}
                 >
                   <div
-                    className="sc-eisiLS hQlWAk"
+                    className="sc-dkaWRx gpzDui"
                     tabIndex={0}
                   >
                     <injectIntl(LiveStopTimes)
@@ -5817,7 +5817,7 @@ exports[`components > viewers > stop viewer should render times after midnight w
                                         title="20"
                                       >
                                         <span
-                                          className="sc-jvfqPk drpPnJ"
+                                          className="sc-edoYdd cUdUnS"
                                           color="333333"
                                           style={
                                             Object {
@@ -5879,7 +5879,7 @@ exports[`components > viewers > stop viewer should render times after midnight w
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -5935,7 +5935,7 @@ exports[`components > viewers > stop viewer should render times after midnight w
                                         >
                                           <styled.span>
                                             <span
-                                              className="sc-edoYdd hROHGP"
+                                              className="sc-jlIlqL fflrIy"
                                             >
                                               <FormattedDayOfWeek
                                                 day="wednesday"
@@ -6022,7 +6022,7 @@ exports[`components > viewers > stop viewer should render times after midnight w
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -6078,7 +6078,7 @@ exports[`components > viewers > stop viewer should render times after midnight w
                                         >
                                           <styled.span>
                                             <span
-                                              className="sc-edoYdd hROHGP"
+                                              className="sc-jlIlqL fflrIy"
                                             >
                                               <FormattedDayOfWeek
                                                 day="wednesday"
@@ -6165,7 +6165,7 @@ exports[`components > viewers > stop viewer should render times after midnight w
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -6221,7 +6221,7 @@ exports[`components > viewers > stop viewer should render times after midnight w
                                         >
                                           <styled.span>
                                             <span
-                                              className="sc-edoYdd hROHGP"
+                                              className="sc-jlIlqL fflrIy"
                                             >
                                               <FormattedDayOfWeek
                                                 day="wednesday"
@@ -6293,7 +6293,7 @@ exports[`components > viewers > stop viewer should render times after midnight w
                               margin={0.25}
                             >
                               <span
-                                className="sc-hkwmXC klpVwE"
+                                className="sc-bSFUlv gNUAmm"
                               >
                                 <input
                                   defaultChecked={true}
@@ -6349,7 +6349,7 @@ exports[`components > viewers > stop viewer should render times after midnight w
                                   spin={true}
                                 >
                                   <span
-                                    className="sc-gHfsNP sc-dkAqVg jdSbUo gBWSYK"
+                                    className="sc-dkAqVg sc-jifHHV ctpxjy czUBjn"
                                   >
                                     <Redo>
                                       <StyledIconBase
@@ -7145,7 +7145,7 @@ exports[`components > viewers > stop viewer should render times after midnight w
                                           >
                                             <div
                                               aria-hidden={true}
-                                              className="sc-bSFUlv knrmPL"
+                                              className="sc-jvfqPk gVipSr"
                                             >
                                               P
                                             </div>
@@ -7828,7 +7828,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                         >
                           <Styled(styled.span)>
                             <span
-                              className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                              className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                             >
                               <ArrowLeft>
                                 <StyledIconBase
@@ -7954,7 +7954,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                           }
                         >
                           <span
-                            className="sc-gHfsNP fqEECF"
+                            className="sc-dkAqVg dwdQnb"
                             style={
                               Object {
                                 "marginLeft": "0.2em",
@@ -8030,7 +8030,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                         >
                           <Styled(styled.span)>
                             <span
-                              className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                              className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                             >
                               <Calendar>
                                 <StyledIconBase
@@ -8116,11 +8116,11 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                   size="0.9em"
                                 >
                                   <DotCircle
-                                    className="sc-gsBqHK hwGZTJ"
+                                    className="sc-aKXVD bNLtzV"
                                     size="0.9em"
                                   >
                                     <StyledIconBase
-                                      className="sc-gsBqHK hwGZTJ"
+                                      className="sc-aKXVD bNLtzV"
                                       iconAttrs={
                                         Object {
                                           "fill": "currentColor",
@@ -8132,7 +8132,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                       size="0.9em"
                                     >
                                       <ForwardRef
-                                        className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-gsBqHK hwGZTJ"
+                                        className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-aKXVD bNLtzV"
                                         iconAttrs={
                                           Object {
                                             "fill": "currentColor",
@@ -8145,7 +8145,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                       >
                                         <svg
                                           aria-hidden="true"
-                                          className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-gsBqHK hwGZTJ"
+                                          className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-aKXVD bNLtzV"
                                           fill="currentColor"
                                           focusable="false"
                                           height="0.9em"
@@ -8193,11 +8193,11 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                   size="0.9em"
                                 >
                                   <MapMarkerAlt
-                                    className="sc-kmATbt iZcPLE"
+                                    className="sc-cvJIAo esTqCF"
                                     size="0.9em"
                                   >
                                     <StyledIconBase
-                                      className="sc-kmATbt iZcPLE"
+                                      className="sc-cvJIAo esTqCF"
                                       iconAttrs={
                                         Object {
                                           "fill": "currentColor",
@@ -8209,7 +8209,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                       size="0.9em"
                                     >
                                       <ForwardRef
-                                        className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-kmATbt iZcPLE"
+                                        className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-cvJIAo esTqCF"
                                         iconAttrs={
                                           Object {
                                             "fill": "currentColor",
@@ -8222,7 +8222,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                       >
                                         <svg
                                           aria-hidden="true"
-                                          className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-kmATbt iZcPLE"
+                                          className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-cvJIAo esTqCF"
                                           fill="currentColor"
                                           focusable="false"
                                           height="0.9em"
@@ -8266,7 +8266,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                   tabIndex={0}
                 >
                   <div
-                    className="sc-eisiLS hQlWAk"
+                    className="sc-dkaWRx gpzDui"
                     tabIndex={0}
                   >
                     <injectIntl(LiveStopTimes)
@@ -9344,7 +9344,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                         title="20"
                                       >
                                         <span
-                                          className="sc-jvfqPk drpPnJ"
+                                          className="sc-edoYdd cUdUnS"
                                           color="333333"
                                           style={
                                             Object {
@@ -9406,7 +9406,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -9462,7 +9462,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                         >
                                           <styled.span>
                                             <span
-                                              className="sc-edoYdd hROHGP"
+                                              className="sc-jlIlqL fflrIy"
                                             >
                                               <FormattedDayOfWeek
                                                 day="monday"
@@ -9549,7 +9549,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -9605,7 +9605,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                         >
                                           <styled.span>
                                             <span
-                                              className="sc-edoYdd hROHGP"
+                                              className="sc-jlIlqL fflrIy"
                                             >
                                               <FormattedDayOfWeek
                                                 day="monday"
@@ -9692,7 +9692,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -9748,7 +9748,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                         >
                                           <styled.span>
                                             <span
-                                              className="sc-edoYdd hROHGP"
+                                              className="sc-jlIlqL fflrIy"
                                             >
                                               <FormattedDayOfWeek
                                                 day="monday"
@@ -9942,7 +9942,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                         title="94"
                                       >
                                         <span
-                                          className="sc-jvfqPk drpPnJ"
+                                          className="sc-edoYdd cUdUnS"
                                           color="333333"
                                           style={
                                             Object {
@@ -10004,7 +10004,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -10060,7 +10060,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                         >
                                           <styled.span>
                                             <span
-                                              className="sc-edoYdd hROHGP"
+                                              className="sc-jlIlqL fflrIy"
                                             >
                                               <FormattedDayOfWeek
                                                 day="tuesday"
@@ -10147,7 +10147,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -10203,7 +10203,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                         >
                                           <styled.span>
                                             <span
-                                              className="sc-edoYdd hROHGP"
+                                              className="sc-jlIlqL fflrIy"
                                             >
                                               <FormattedDayOfWeek
                                                 day="tuesday"
@@ -10290,7 +10290,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -10346,7 +10346,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                         >
                                           <styled.span>
                                             <span
-                                              className="sc-edoYdd hROHGP"
+                                              className="sc-jlIlqL fflrIy"
                                             >
                                               <FormattedDayOfWeek
                                                 day="tuesday"
@@ -10490,7 +10490,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                         title="94"
                                       >
                                         <span
-                                          className="sc-jvfqPk drpPnJ"
+                                          className="sc-edoYdd cUdUnS"
                                           color="333333"
                                           style={
                                             Object {
@@ -10552,7 +10552,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -10608,7 +10608,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                         >
                                           <styled.span>
                                             <span
-                                              className="sc-edoYdd hROHGP"
+                                              className="sc-jlIlqL fflrIy"
                                             >
                                               <FormattedDayOfWeek
                                                 day="tuesday"
@@ -10770,7 +10770,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                         title="36"
                                       >
                                         <span
-                                          className="sc-jvfqPk drpPnJ"
+                                          className="sc-edoYdd cUdUnS"
                                           color="333333"
                                           style={
                                             Object {
@@ -10832,7 +10832,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -10888,7 +10888,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                         >
                                           <styled.span>
                                             <span
-                                              className="sc-edoYdd hROHGP"
+                                              className="sc-jlIlqL fflrIy"
                                             >
                                               <FormattedDayOfWeek
                                                 day="tuesday"
@@ -10975,7 +10975,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -11031,7 +11031,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                         >
                                           <styled.span>
                                             <span
-                                              className="sc-edoYdd hROHGP"
+                                              className="sc-jlIlqL fflrIy"
                                             >
                                               <FormattedDayOfWeek
                                                 day="tuesday"
@@ -11189,7 +11189,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                         title="94"
                                       >
                                         <span
-                                          className="sc-jvfqPk drpPnJ"
+                                          className="sc-edoYdd cUdUnS"
                                           color="333333"
                                           style={
                                             Object {
@@ -11251,7 +11251,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -11307,7 +11307,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                         >
                                           <styled.span>
                                             <span
-                                              className="sc-edoYdd hROHGP"
+                                              className="sc-jlIlqL fflrIy"
                                             >
                                               <FormattedDayOfWeek
                                                 day="wednesday"
@@ -11451,7 +11451,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                         title="36"
                                       >
                                         <span
-                                          className="sc-jvfqPk drpPnJ"
+                                          className="sc-edoYdd cUdUnS"
                                           color="333333"
                                           style={
                                             Object {
@@ -11513,7 +11513,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -11569,7 +11569,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                         >
                                           <styled.span>
                                             <span
-                                              className="sc-edoYdd hROHGP"
+                                              className="sc-jlIlqL fflrIy"
                                             >
                                               <FormattedDayOfWeek
                                                 day="wednesday"
@@ -11727,7 +11727,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                         title="94"
                                       >
                                         <span
-                                          className="sc-jvfqPk drpPnJ"
+                                          className="sc-edoYdd cUdUnS"
                                           color="333333"
                                           style={
                                             Object {
@@ -11789,7 +11789,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -11845,7 +11845,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                         >
                                           <styled.span>
                                             <span
-                                              className="sc-edoYdd hROHGP"
+                                              className="sc-jlIlqL fflrIy"
                                             >
                                               <FormattedDayOfWeek
                                                 day="thursday"
@@ -11917,7 +11917,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                               margin={0.25}
                             >
                               <span
-                                className="sc-hkwmXC klpVwE"
+                                className="sc-bSFUlv gNUAmm"
                               >
                                 <input
                                   defaultChecked={true}
@@ -11973,7 +11973,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                   spin={true}
                                 >
                                   <span
-                                    className="sc-gHfsNP sc-dkAqVg jdSbUo gBWSYK"
+                                    className="sc-dkAqVg sc-jifHHV ctpxjy czUBjn"
                                   >
                                     <Redo>
                                       <StyledIconBase
@@ -13801,7 +13801,7 @@ exports[`components > viewers > stop viewer should render with OTP transit index
                                           >
                                             <div
                                               aria-hidden={true}
-                                              className="sc-bSFUlv knrmPL"
+                                              className="sc-jvfqPk gVipSr"
                                             >
                                               P
                                             </div>
@@ -14479,7 +14479,7 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                         >
                           <Styled(styled.span)>
                             <span
-                              className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                              className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                             >
                               <ArrowLeft>
                                 <StyledIconBase
@@ -14605,7 +14605,7 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                           }
                         >
                           <span
-                            className="sc-gHfsNP fqEECF"
+                            className="sc-dkAqVg dwdQnb"
                             style={
                               Object {
                                 "marginLeft": "0.2em",
@@ -14681,7 +14681,7 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                         >
                           <Styled(styled.span)>
                             <span
-                              className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                              className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                             >
                               <Calendar>
                                 <StyledIconBase
@@ -14767,11 +14767,11 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                                   size="0.9em"
                                 >
                                   <DotCircle
-                                    className="sc-gsBqHK hwGZTJ"
+                                    className="sc-aKXVD bNLtzV"
                                     size="0.9em"
                                   >
                                     <StyledIconBase
-                                      className="sc-gsBqHK hwGZTJ"
+                                      className="sc-aKXVD bNLtzV"
                                       iconAttrs={
                                         Object {
                                           "fill": "currentColor",
@@ -14783,7 +14783,7 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                                       size="0.9em"
                                     >
                                       <ForwardRef
-                                        className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-gsBqHK hwGZTJ"
+                                        className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-aKXVD bNLtzV"
                                         iconAttrs={
                                           Object {
                                             "fill": "currentColor",
@@ -14796,7 +14796,7 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                                       >
                                         <svg
                                           aria-hidden="true"
-                                          className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-gsBqHK hwGZTJ"
+                                          className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-aKXVD bNLtzV"
                                           fill="currentColor"
                                           focusable="false"
                                           height="0.9em"
@@ -14844,11 +14844,11 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                                   size="0.9em"
                                 >
                                   <MapMarkerAlt
-                                    className="sc-kmATbt iZcPLE"
+                                    className="sc-cvJIAo esTqCF"
                                     size="0.9em"
                                   >
                                     <StyledIconBase
-                                      className="sc-kmATbt iZcPLE"
+                                      className="sc-cvJIAo esTqCF"
                                       iconAttrs={
                                         Object {
                                           "fill": "currentColor",
@@ -14860,7 +14860,7 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                                       size="0.9em"
                                     >
                                       <ForwardRef
-                                        className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-kmATbt iZcPLE"
+                                        className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-cvJIAo esTqCF"
                                         iconAttrs={
                                           Object {
                                             "fill": "currentColor",
@@ -14873,7 +14873,7 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                                       >
                                         <svg
                                           aria-hidden="true"
-                                          className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-kmATbt iZcPLE"
+                                          className="StyledIconBase-sc-ea9ulj-0 fqiNOa sc-cvJIAo esTqCF"
                                           fill="currentColor"
                                           focusable="false"
                                           height="0.9em"
@@ -14917,7 +14917,7 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                   tabIndex={0}
                 >
                   <div
-                    className="sc-eisiLS hQlWAk"
+                    className="sc-dkaWRx gpzDui"
                     tabIndex={0}
                   >
                     <injectIntl(LiveStopTimes)
@@ -15987,7 +15987,7 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                                         title="20"
                                       >
                                         <span
-                                          className="sc-jvfqPk drpPnJ"
+                                          className="sc-edoYdd cUdUnS"
                                           color="333333"
                                           style={
                                             Object {
@@ -16049,7 +16049,7 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -16105,7 +16105,7 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                                         >
                                           <styled.span>
                                             <span
-                                              className="sc-edoYdd hROHGP"
+                                              className="sc-jlIlqL fflrIy"
                                             >
                                               <FormattedDayOfWeek
                                                 day="monday"
@@ -16192,7 +16192,7 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -16248,7 +16248,7 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                                         >
                                           <styled.span>
                                             <span
-                                              className="sc-edoYdd hROHGP"
+                                              className="sc-jlIlqL fflrIy"
                                             >
                                               <FormattedDayOfWeek
                                                 day="monday"
@@ -16335,7 +16335,7 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                                           title="components.StopTimeCell.scheduled"
                                         >
                                           <span
-                                            className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                                            className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                                             style={
                                               Object {
                                                 "fontSize": "0.6em",
@@ -16391,7 +16391,7 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                                         >
                                           <styled.span>
                                             <span
-                                              className="sc-edoYdd hROHGP"
+                                              className="sc-jlIlqL fflrIy"
                                             >
                                               <FormattedDayOfWeek
                                                 day="monday"
@@ -16463,7 +16463,7 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                               margin={0.25}
                             >
                               <span
-                                className="sc-hkwmXC klpVwE"
+                                className="sc-bSFUlv gNUAmm"
                               >
                                 <input
                                   defaultChecked={true}
@@ -16519,7 +16519,7 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                                   spin={true}
                                 >
                                   <span
-                                    className="sc-gHfsNP sc-dkAqVg jdSbUo gBWSYK"
+                                    className="sc-dkAqVg sc-jifHHV ctpxjy czUBjn"
                                   >
                                     <Redo>
                                       <StyledIconBase
@@ -18327,7 +18327,7 @@ exports[`components > viewers > stop viewer should render with TriMet transit in
                                           >
                                             <div
                                               aria-hidden={true}
-                                              className="sc-bSFUlv knrmPL"
+                                              className="sc-jvfqPk gVipSr"
                                             >
                                               P
                                             </div>
@@ -18587,7 +18587,7 @@ exports[`components > viewers > stop viewer should render with initial stop id a
                         >
                           <Styled(styled.span)>
                             <span
-                              className="sc-gHfsNP sc-dkAqVg fqEECF gBWSYK"
+                              className="sc-dkAqVg sc-jifHHV dwdQnb czUBjn"
                             >
                               <ArrowLeft>
                                 <StyledIconBase
diff --git a/lib/components/form/styled.ts b/lib/components/form/styled.ts
index 5056873f7..28938a89c 100644
--- a/lib/components/form/styled.ts
+++ b/lib/components/form/styled.ts
@@ -3,7 +3,7 @@ import {
   SettingsSelectorPanel,
   Styled as TripFormClasses
 } from '@opentripplanner/trip-form'
-import { Input, MenuItemA } from '@opentripplanner/location-field/lib/styled'
+import { Input, MenuItemLi } from '@opentripplanner/location-field/lib/styled'
 import LocationField from '@opentripplanner/location-field'
 import styled, { css } from 'styled-components'
 
@@ -222,8 +222,7 @@ export const StyledLocationField = styled(LocationField)`
     padding: 6px 12px;
   }
 
-  ${MenuItemA} {
-    text-decoration: none;
+  ${MenuItemLi} {
     &:hover {
       color: inherit;
     }
diff --git a/lib/components/user/places/place-location-field.ts b/lib/components/user/places/place-location-field.ts
index 711be8ae5..059033113 100644
--- a/lib/components/user/places/place-location-field.ts
+++ b/lib/components/user/places/place-location-field.ts
@@ -2,7 +2,6 @@ import {
   ClearButton,
   DropdownButton,
   Input,
-  MenuItemA,
   MenuItemLi,
   MenuItemList
 } from '@opentripplanner/location-field/lib/styled'
@@ -42,18 +41,16 @@ const StyledLocationField = styled(LocationField)<Props>`
     position: absolute;
     ${(props) => (props.static ? 'width: 100%;' : '')}
   }
-  ${MenuItemA} {
+  ${MenuItemLi} {
+    overflow: hidden;
+    ${(props) =>
+      props.static ? 'padding-left: 10px; padding-right: 5px; width: 100%' : ''}
+
     &:focus,
     &:hover {
       color: inherit;
-      text-decoration: none;
     }
   }
-  ${MenuItemA}, ${MenuItemLi} {
-    overflow: hidden;
-    ${(props) =>
-      props.static ? 'padding-left: 10px; padding-right: 5px; width: 100%' : ''}
-  }
 `
 
 /**
diff --git a/package.json b/package.json
index 874db6aa9..a57707877 100644
--- a/package.json
+++ b/package.json
@@ -45,8 +45,8 @@
     "@opentripplanner/geocoder": "^1.4.2",
     "@opentripplanner/humanize-distance": "^1.2.0",
     "@opentripplanner/icons": "^2.0.6",
-    "@opentripplanner/itinerary-body": "^5.0.9",
-    "@opentripplanner/location-field": "^2.0.10",
+    "@opentripplanner/itinerary-body": "^5.1.0",
+    "@opentripplanner/location-field": "^2.0.11",
     "@opentripplanner/location-icon": "^1.4.1",
     "@opentripplanner/map-popup": "^2.0.6",
     "@opentripplanner/otp2-tile-overlay": "^1.0.6",
@@ -58,7 +58,7 @@
     "@opentripplanner/transit-vehicle-overlay": "^4.0.6",
     "@opentripplanner/transitive-overlay": "^3.0.16",
     "@opentripplanner/trip-details": "^5.0.4",
-    "@opentripplanner/trip-form": "^3.3.2",
+    "@opentripplanner/trip-form": "^3.3.3",
     "@opentripplanner/trip-viewer-overlay": "^2.0.7",
     "@opentripplanner/vehicle-rental-overlay": "^2.1.3",
     "@styled-icons/fa-regular": "^10.34.0",
diff --git a/yarn.lock b/yarn.lock
index 04b7013a0..2f581aacf 100644
--- a/yarn.lock
+++ b/yarn.lock
@@ -2413,10 +2413,10 @@
     "@opentripplanner/core-utils" "^11.0.2"
     prop-types "^15.7.2"
 
-"@opentripplanner/itinerary-body@^5.0.2", "@opentripplanner/itinerary-body@^5.0.7", "@opentripplanner/itinerary-body@^5.0.9":
-  version "5.0.9"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/itinerary-body/-/itinerary-body-5.0.9.tgz#c625cdf23e234aa0c66c813edc19d6053c040ed8"
-  integrity sha512-SfO8kgB08m7jp+/A+/MzludEh7gt0Qm+eWVMBRm955rxSeSPaSD4wg19z45ql3/eCYhWi9j4LTDo1NBQFpDT3A==
+"@opentripplanner/itinerary-body@^5.0.2", "@opentripplanner/itinerary-body@^5.0.7", "@opentripplanner/itinerary-body@^5.1.0":
+  version "5.1.0"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/itinerary-body/-/itinerary-body-5.1.0.tgz#29bba91db379bb4f63d13ec95c1cb058248d0683"
+  integrity sha512-DTS4KlbqokS/ZA+gL0QCuPFORoPq/GVcHlRv0s9YqKmr0aS5eBBLg4f4mOuv1CcNeHKyZc6lNb/Ro3epjshd5A==
   dependencies:
     "@opentripplanner/core-utils" "^11.0.2"
     "@opentripplanner/humanize-distance" "^1.2.0"
@@ -2431,10 +2431,10 @@
     react-resize-detector "^4.2.1"
     string-similarity "^4.0.4"
 
-"@opentripplanner/location-field@^2.0.10":
-  version "2.0.10"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/location-field/-/location-field-2.0.10.tgz#4563e3c680de2e3cf5468860eac9bfcc312496f3"
-  integrity sha512-s/eoEvjZOudG+BYJrdpNI3LTcpH5DZtEK8i+LHwIgyx4xXbHoUbGX4VF3IF7uP9GzNoQDms7G1q2JrA/bduMdw==
+"@opentripplanner/location-field@^2.0.11":
+  version "2.0.11"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/location-field/-/location-field-2.0.11.tgz#06a31ec2e62cf5b542d3392281bc28b9dd1ea416"
+  integrity sha512-viyC1vInANBwsd9w3KtE6Y4qYh/yuJAWDStlIx9Ce9z2TraoBHxYKlVhx6w+JxIgiBziEdvZ2staMjo0KKn13A==
   dependencies:
     "@conveyal/geocoder-arcgis-geojson" "^0.0.3"
     "@opentripplanner/core-utils" "^11.0.2"
@@ -2561,10 +2561,10 @@
     flat "^5.0.2"
     react-animate-height "^3.0.4"
 
-"@opentripplanner/trip-form@^3.3.2":
-  version "3.3.2"
-  resolved "https://registry.yarnpkg.com/@opentripplanner/trip-form/-/trip-form-3.3.2.tgz#4dba0137a21e5e945274d4d67a0decd0a8519055"
-  integrity sha512-BiH1UOqsKSlBuT3fUQEn30FnP+82j5X5Kb5cAAR789wPVu1IehMU4Z+v2kpjW7jRC+uh5MG6d3YWsPX5pWG0Ag==
+"@opentripplanner/trip-form@^3.3.3":
+  version "3.3.3"
+  resolved "https://registry.yarnpkg.com/@opentripplanner/trip-form/-/trip-form-3.3.3.tgz#a7975eb219c7e23876e603132145365eedbb2638"
+  integrity sha512-frS1pdaOicVaGMenf25H12/Ne9KATHJ71ojLqvpSj1qA2MDHYXko07iymhgZ5kJw6wjdkRcIPQxc+rES9OZ3Sw==
   dependencies:
     "@floating-ui/react" "^0.19.2"
     "@opentripplanner/core-utils" "^11.0.2"