diff --git a/themes/fid_bbi/scss/blocks/cart.scss b/themes/fid_bbi/scss/blocks/cart.scss
index c4a4baa1fe1f4450281be28a8eb9877b4d78ca96..eb85702cf9804323d309dc4f22ff6fbadcd90075 100644
--- a/themes/fid_bbi/scss/blocks/cart.scss
+++ b/themes/fid_bbi/scss/blocks/cart.scss
@@ -2,10 +2,29 @@
   display: inline-flex;
   flex-wrap: wrap;
   margin: g(-.25) g(-.25) g(1 - .25);
+  width: calc(100% + #{g(.25 * 2)});
 
   > * {
     margin: g(.25);
   }
+
+  button,
+  .btn-group {
+    width: 100%;
+
+    @media #{$bp1} {
+      width: auto;
+    }
+  }
+}
+
+.cart-delete-all {
+  border: 0;
+  font: inherit;
+  font-weight: bold;
+  margin: g(-.25) g(-.5);
+  padding: g(.25) g(.5);
+  white-space: nowrap;
 }
 
 .cart-item {
diff --git a/themes/fid_bbi/scss/blocks/modal.scss b/themes/fid_bbi/scss/blocks/modal.scss
index b788999bbdff2ae0f56aa14896c4719684251d40..60671616adcdd6ebefd87cb0729bb75110a9ec8c 100644
--- a/themes/fid_bbi/scss/blocks/modal.scss
+++ b/themes/fid_bbi/scss/blocks/modal.scss
@@ -50,7 +50,7 @@
   overflow: auto;
   transform: translateY(g(-1));
   transition: transform $td;
-  width: $line-width;
+  width: $line-width + g(2);
 
   .modal.in & {
     transform: translateY(0);
diff --git a/themes/fid_bbi/templates/cart/cart.phtml b/themes/fid_bbi/templates/cart/cart.phtml
index b49b5f8255f4a3213b825779004a8f99369efc92..d08beb66e452e6cfe2a3a90672e9e2b4ce42ce0a 100644
--- a/themes/fid_bbi/templates/cart/cart.phtml
+++ b/themes/fid_bbi/templates/cart/cart.phtml
@@ -78,37 +78,37 @@ $this->headTitle($this->translate('Book Bag'));
           </li>
         </ul>
       </div>
-
-      <div class="btn-group">
-        <button type="submit" class="button -small dropdown-toggle" name="empty" data-toggle="dropdown" id="cart-empty-label" value="1">
-          <!-- TODO: Icon? -->
-          <?=$this->translate('Empty Book Bag')?>
-        </button>
-        <ul class="dropdown-menu" role="menu" aria-labelledby="cart-empty-label">
-          <li>
-            <a
-              href="javascript:;"
-              id="cart-confirm-empty"
-              onClick="submitFormWithButton(this, 'empty')"
-              title="<?=$this->translate('bookbag_confirm_empty')?>"
-            >
-              <?=$this->translate('confirm_dialog_yes')?>
-            </a>
-          </li>
-          <li>
-            <a href="javascript:;" onClick="$('.fa.fa-spinner').remove()">
-              <?=$this->translate('confirm_dialog_no')?>
-            </a>
-          </li>
-        </ul>
-      </div>
     </div>
   <?php endif; ?>
 
-  <p>
-    <input id="cart-select-all" type="checkbox" name="selectAll" class="checkbox-select-all">
-    <label for="cart-select-all"><?=$this->translate('select_page')?></label>
-  </p>
+  <div class="cart-controls">
+    <div>
+      <input id="cart-select-all" type="checkbox" name="selectAll" class="checkbox-select-all">
+      <label for="cart-select-all"><?=$this->translate('select_page')?></label>
+    </div>
+    <div style="flex: 0; margin-left: auto">
+      <button type="submit" class="cart-delete-all dropdown-toggle" name="empty" data-toggle="dropdown" id="cart-empty-label" value="1">
+        <?=$this->translate('Empty Book Bag')?>
+      </button>
+      <ul class="dropdown-menu" role="menu" aria-labelledby="cart-empty-label">
+        <li>
+          <a
+            href="javascript:;"
+            id="cart-confirm-empty"
+            onClick="submitFormWithButton(this, 'empty')"
+            title="<?=$this->translate('bookbag_confirm_empty')?>"
+          >
+            <?=$this->translate('confirm_dialog_yes')?>
+          </a>
+        </li>
+        <li>
+          <a href="javascript:;" onClick="$('.fa.fa-spinner').remove()">
+            <?=$this->translate('confirm_dialog_no')?>
+          </a>
+        </li>
+      </ul>
+    </div>
+  </div>
 
   <hr>
 
diff --git a/themes/fid_bbi/templates/cart/contents.phtml b/themes/fid_bbi/templates/cart/contents.phtml
index 4fd150a1f81b62ea93a45d42542ab4a6f9c29b2d..396296b827853b060b9d74d5738b485a3b52f0d3 100644
--- a/themes/fid_bbi/templates/cart/contents.phtml
+++ b/themes/fid_bbi/templates/cart/contents.phtml
@@ -41,6 +41,9 @@
     <?php endforeach; ?>
   </ul>
 <?php else: ?>
-  <p class="alert alert-info"><?=$this->translate('bookbag_is_empty')?>.</p>
+  <p class="alert alert-info">
+    <?=$this->icon('info')?>
+    <?=$this->translate('bookbag_is_empty')?>.
+  </p>
 <?php endif; ?>
 <!-- fid_bbi: cart - contents - END -->