diff --git a/app/templates/components/ui-table/cell/events/view/sessions/cell-session-title.hbs b/app/templates/components/ui-table/cell/events/view/sessions/cell-session-title.hbs
index cac4ba78a69..e1793f41dca 100644
--- a/app/templates/components/ui-table/cell/events/view/sessions/cell-session-title.hbs
+++ b/app/templates/components/ui-table/cell/events/view/sessions/cell-session-title.hbs
@@ -1,15 +1,15 @@
 {{this.record}}
 <div class="hidden ui divider"></div>
 <div class="ui horizontal compact basic buttons">
-  <UiPopup @content={{t "View Session"}} @class="{{if this.device.isMobile 'medium' 'huge'}} ui icon button" @click={{action this.props.actions.viewSession this.extraRecords.id}} @position="left center">
+  <UiPopup @content={{t "View Session"}} @class="ui icon button" @click={{action this.props.actions.viewSession this.extraRecords.id}} @position="left center">
     <i class="unhide icon"></i>		
   </UiPopup>
   {{#if (not this.extraRecords.isLocked)}}
-    <UiPopup @content={{t "Edit Session"}} @class="{{if this.device.isMobile 'medium' 'huge'}} ui icon button" @click={{action this.props.actions.editSession this.extraRecords.id this.extraRecords.event.id}} @position="left center">
+    <UiPopup @content={{t "Edit Session"}} @class="ui icon button" @click={{action this.props.actions.editSession this.extraRecords.id this.extraRecords.event.id}} @position="left center">
       <i class="edit icon"></i>
     </UiPopup>
   {{/if}}
-  <UiPopup @content={{t "Delete Session"}} @click={{action (confirm (t "Are you sure you would like to delete this Session?") (action this.props.actions.deleteSession this.extraRecords.id))}} @class="{{if this.device.isMobile 'medium' 'huge'}} ui icon button" @position="left center">
+  <UiPopup @content={{t "Delete Session"}} @click={{action (confirm (t "Are you sure you would like to delete this Session?") (action this.props.actions.deleteSession this.extraRecords.id))}} @class="ui icon button" @position="left center">
     <i class="trash icon"></i>
   </UiPopup>
 </div>
diff --git a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs
index 17bb930ea4d..d31c4ffb01c 100644
--- a/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs
+++ b/app/templates/components/ui-table/cell/events/view/tickets/orders/cell-order.hbs
@@ -25,21 +25,21 @@
 </div>
 <div class="ui horizontal compact basic buttons">
   {{#if (and (eq this.extraRecords.status 'placed') (can-modify-order this.record))}}
-    <UiPopup @content={{t "Mark Completed"}} @click={{action (confirm (t "Are you sure you would like to mark this Order as completed?") (action this.props.actions.completeOrder this.record))}} @class="{{if this.device.isMobile 'medium' 'huge'}} ui icon button" @position="top center">
+    <UiPopup @content={{t "Mark Completed"}} @click={{action (confirm (t "Are you sure you would like to mark this Order as completed?") (action this.props.actions.completeOrder this.record))}} @class="ui icon button" @position="top center">
       <i class="check icon"></i>
     </UiPopup>
   {{/if}}
   {{#if (and (not-eq this.extraRecords.status 'cancelled') (not-eq this.extraRecords.status 'expired') (can-modify-order this.record))}}
-    <UiPopup @content={{t "Cancel order"}} @click={{action (confirm (t "Are you sure you would like to cancel this Order?") (action this.props.actions.cancelOrder this.record))}} @class="{{if this.device.isMobile 'medium' 'huge'}} ui icon button" @position="top center">
+    <UiPopup @content={{t "Cancel order"}} @click={{action (confirm (t "Are you sure you would like to cancel this Order?") (action this.props.actions.cancelOrder this.record))}} @class="ui icon button" @position="top center">
       <i class="delete icon"></i>
     </UiPopup>
   {{/if}}
   {{#if (can-modify-order this.record)}}
-    <UiPopup @content={{t "Delete order"}} @click={{action (confirm (t "Are you sure you would like to delete this Order?") (action this.props.actions.deleteOrder this.record))}} @class="{{if this.device.isMobile 'medium' 'huge'}} ui icon button" @position="top center">
+    <UiPopup @content={{t "Delete order"}} @click={{action (confirm (t "Are you sure you would like to delete this Order?") (action this.props.actions.deleteOrder this.record))}} @class="ui icon button" @position="top center">
       <i class="trash icon"></i>
     </UiPopup>
   {{/if}}
-  <UiPopup @content={{t "Resend order confirmation"}} @click={{action this.props.actions.resendConfirmation this.record}} @class="{{if this.device.isMobile 'medium' 'huge'}} ui icon button" @position="top center">
+  <UiPopup @content={{t "Resend order confirmation"}} @click={{action this.props.actions.resendConfirmation this.record}} @class="ui icon button" @position="top center">
     <i class="mail outline icon"></i>
   </UiPopup>
 </div>