diff --git a/icons/arrow-swap.svg b/icons/arrow-swap.svg
index a6f0106..3e9cd87 100644
--- a/icons/arrow-swap.svg
+++ b/icons/arrow-swap.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M12.1464 3.14645C12.3417 2.95118 12.6583 2.95118 12.8536 3.14645L15.8536 6.14645C16.0488 6.34171 16.0488 6.65829 15.8536 6.85355L12.8536 9.85355C12.6583 10.0488 12.3417 10.0488 12.1464 9.85355C11.9512 9.65829 11.9512 9.34171 12.1464 9.14645L14.2929 7H4.5C4.22386 7 4 6.77614 4 6.5C4 6.22386 4.22386 6 4.5 6H14.2929L12.1464 3.85355C11.9512 3.65829 11.9512 3.34171 12.1464 3.14645Z" fill="#212121"/>
-<path d="M7.85355 10.1464C8.04882 10.3417 8.04882 10.6583 7.85355 10.8536L5.70711 13H15.5C15.7761 13 16 13.2239 16 13.5C16 13.7761 15.7761 14 15.5 14H5.70711L7.85355 16.1464C8.04882 16.3417 8.04882 16.6583 7.85355 16.8536C7.65829 17.0488 7.34171 17.0488 7.14645 16.8536L4.14645 13.8536C3.95118 13.6583 3.95118 13.3417 4.14645 13.1464L7.14645 10.1464C7.34171 9.95118 7.65829 9.95118 7.85355 10.1464Z" fill="#212121"/>
+<svg width="20" height="20" viewBox="0 0 20 20" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+<path d="M12.1464 3.14645C12.3417 2.95118 12.6583 2.95118 12.8536 3.14645L15.8536 6.14645C16.0488 6.34171 16.0488 6.65829 15.8536 6.85355L12.8536 9.85355C12.6583 10.0488 12.3417 10.0488 12.1464 9.85355C11.9512 9.65829 11.9512 9.34171 12.1464 9.14645L14.2929 7H4.5C4.22386 7 4 6.77614 4 6.5C4 6.22386 4.22386 6 4.5 6H14.2929L12.1464 3.85355C11.9512 3.65829 11.9512 3.34171 12.1464 3.14645Z"/>
+<path d="M7.85355 10.1464C8.04882 10.3417 8.04882 10.6583 7.85355 10.8536L5.70711 13H15.5C15.7761 13 16 13.2239 16 13.5C16 13.7761 15.7761 14 15.5 14H5.70711L7.85355 16.1464C8.04882 16.3417 8.04882 16.6583 7.85355 16.8536C7.65829 17.0488 7.34171 17.0488 7.14645 16.8536L4.14645 13.8536C3.95118 13.6583 3.95118 13.3417 4.14645 13.1464L7.14645 10.1464C7.34171 9.95118 7.65829 9.95118 7.85355 10.1464Z"/>
 </svg>
diff --git a/icons/tab-copy.svg b/icons/tab-copy.svg
index 6b23f47..427332b 100644
--- a/icons/tab-copy.svg
+++ b/icons/tab-copy.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4 5.5C4 3.567 5.567 2 7.5 2H10C10.8179 2 11.5441 2.39278 12.0002 3H7.5C6.11929 3 5 4.11929 5 5.5V15.0002C4.39278 14.5441 4 13.8179 4 13V5.5Z" fill="#212121"/>
-<path d="M13.4322 2.00548L13.5 2C13.7531 2 13.9623 2.22572 13.9954 2.51858L14 2.59999V17.4C14 17.7314 13.7761 18 13.5 18C13.2469 18 13.0377 17.7743 13.0046 17.4814L13 17.4V17H8C6.89543 17 6 16.1046 6 15V6C6 4.89543 6.89543 4 8 4H13V3.60022L13 3.59918L13 2.59999C13 2.29624 13.1881 2.04521 13.4322 2.00548ZM8 5C7.44772 5 7 5.44772 7 6V15C7 15.5523 7.44772 16 8 16H13V5H8Z" fill="#212121"/>
+<svg width="20" height="20" viewBox="0 0 20 20" transform="rotate(90)" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+<path d="M4 5.5C4 3.567 5.567 2 7.5 2H10C10.8179 2 11.5441 2.39278 12.0002 3H7.5C6.11929 3 5 4.11929 5 5.5V15.0002C4.39278 14.5441 4 13.8179 4 13V5.5Z"/>
+<path d="M13.4322 2.00548L13.5 2C13.7531 2 13.9623 2.22572 13.9954 2.51858L14 2.59999V17.4C14 17.7314 13.7761 18 13.5 18C13.2469 18 13.0377 17.7743 13.0046 17.4814L13 17.4V17H8C6.89543 17 6 16.1046 6 15V6C6 4.89543 6.89543 4 8 4H13V3.60022L13 3.59918L13 2.59999C13 2.29624 13.1881 2.04521 13.4322 2.00548ZM8 5C7.44772 5 7 5.44772 7 6V15C7 15.5523 7.44772 16 8 16H13V5H8Z"/>
 </svg>
diff --git a/icons/tab-multiple.svg b/icons/tab-multiple.svg
index 3b6fc86..f77d817 100644
--- a/icons/tab-multiple.svg
+++ b/icons/tab-multiple.svg
@@ -1,4 +1,4 @@
-<svg width="20" height="20" viewBox="0 0 20 20" fill="none" xmlns="http://www.w3.org/2000/svg">
-<path d="M4.5 2C3.11929 2 2 3.11929 2 4.5V12.5C2 13.8807 3.11929 15 4.5 15H12.5C13.8807 15 15 13.8807 15 12.5V4.5C15 3.11929 13.8807 2 12.5 2H4.5ZM14 4.5V5H7.5C7.22386 5 7 4.77614 7 4.5V3H12.5C13.3284 3 14 3.67157 14 4.5ZM6 4.5C6 5.32843 6.67157 6 7.5 6H14V12.5C14 13.3284 13.3284 14 12.5 14H4.5C3.67157 14 3 13.3284 3 12.5V4.5C3 3.67157 3.67157 3 4.5 3H6V4.5Z" fill="#212121"/>
-<path d="M7.4998 18C6.29032 18 5.28144 17.1411 5.0498 16H6.08515C6.29107 16.5826 6.84669 17 7.4998 17H13.9998C15.6566 17 16.9998 15.6569 16.9998 14V7.5C16.9998 6.84689 16.5824 6.29127 15.9998 6.08535V5.05001C17.1409 5.28165 17.9998 6.29052 17.9998 7.5V14C17.9998 16.2091 16.2089 18 13.9998 18H7.4998Z" fill="#212121"/>
+<svg width="20" height="20" viewBox="0 0 20 20" fill="context-fill" fill-opacity="context-fill-opacity" xmlns="http://www.w3.org/2000/svg">
+<path d="M4.5 2C3.11929 2 2 3.11929 2 4.5V12.5C2 13.8807 3.11929 15 4.5 15H12.5C13.8807 15 15 13.8807 15 12.5V4.5C15 3.11929 13.8807 2 12.5 2H4.5ZM14 4.5V5H7.5C7.22386 5 7 4.77614 7 4.5V3H12.5C13.3284 3 14 3.67157 14 4.5ZM6 4.5C6 5.32843 6.67157 6 7.5 6H14V12.5C14 13.3284 13.3284 14 12.5 14H4.5C3.67157 14 3 13.3284 3 12.5V4.5C3 3.67157 3.67157 3 4.5 3H6V4.5Z"/>
+<path d="M7.4998 18C6.29032 18 5.28144 17.1411 5.0498 16H6.08515C6.29107 16.5826 6.84669 17 7.4998 17H13.9998C15.6566 17 16.9998 15.6569 16.9998 14V7.5C16.9998 6.84689 16.5824 6.29127 15.9998 6.08535V5.05001C17.1409 5.28165 17.9998 6.29052 17.9998 7.5V14C17.9998 16.2091 16.2089 18 13.9998 18H7.4998Z"/>
 </svg>
diff --git a/userChrome.css b/userChrome.css
index 84e54a0..37a653c 100644
--- a/userChrome.css
+++ b/userChrome.css
@@ -913,6 +913,7 @@
   }
   #context_duplicateTab,
   #context_duplicateTabs {
+    background-image: url(./icons/tab-copy.svg);
   }
 
   #context_bookmarkTab,
@@ -920,6 +921,7 @@
     background-image: url(chrome://browser/skin/bookmark.svg);
   }
   #context_moveTabOptions {
+    background-image: url(./icons/arrow-swap.svg);
   }
   #context_sendTabToDevice {
     background-image: url(chrome://browser/skin/send-to-device.svg);
@@ -928,6 +930,7 @@
     background-image: url(./icons/container-openin-16.svg);
   }
   #context_selectAllTabs {
+    background-image: url(./icons/tab-multiple.svg);
   }
 
   #context_closeTab {
@@ -976,6 +979,7 @@
     background-image: url(chrome://browser/skin/bookmark.svg);
   }
   #toolbar-context-selectAllTabs {
+    background-image: url(./icons/tab-multiple.svg);
   }
   #toolbar-context-undoCloseTab {
     background-image: url(chrome://global/skin/icons/undo.svg);