diff --git a/chrome/urlbar_container_color_border.css b/chrome/urlbar_container_color_border.css
new file mode 100644
index 0000000..937738b
--- /dev/null
+++ b/chrome/urlbar_container_color_border.css
@@ -0,0 +1,38 @@
+/* Source file https://github.com/MrOtherGuy/firefox-csshacks/tree/master/chrome/urlbar_container_color_border.css made available under Mozilla Public License v. 2.0
+See the above repository for updates as well as full license text. */
+
+/* Draws a border around urlbar using the color of the current container. */
+
+#urlbar:not([open]) > #urlbar-input-container{
+  border-width: 0 !important;
+  padding: 2px !important;
+}
+#urlbar:not([open]) #userContext-icons::before{
+  box-sizing: border-box;
+  display: block;
+  position: absolute;
+  content: "";
+  left: 0;
+  top: 0;
+  width: 100%;
+  height: 100%;
+  outline: 1px solid var(--identity-icon-color);
+  border-radius: var(--toolbarbutton-border-radius);
+  outline-offset: -1px;
+  pointer-events: none;
+}
+#urlbar[focused] #userContext-icons::before{
+  outline-width: 2px;
+  outline-offset: -2px
+}
+
+/* OPTIONAL FEATURES */
+
+/* Hide container label in urlbar */
+/* #userContext-label{ display: none } */
+
+/* Hide container icon in urlbar */
+/* #userContext-indicator{ display: none } */
+
+/* Hide the container line above tabs */
+/* .tab-context-line{ display: none } */
\ No newline at end of file
diff --git a/html_resources/tagmap.json b/html_resources/tagmap.json
index 2def08d..bd9bd0b 100644
--- a/html_resources/tagmap.json
+++ b/html_resources/tagmap.json
@@ -141,5 +141,6 @@
 "dark_date_picker_panel.css":["popup","dark-mode"],
 "textual_searchbar_one-offs.css":["popup","menu"],
 "menulike_bookmarks_folder_popups.css":["menu","bookmarks","colors"],
-"selected_tab_gradient_border.css":["tab","colors","effect"]
+"selected_tab_gradient_border.css":["tab","colors","effect"],
+"urlbar_container_color_border.css":["colors","urlbar"]
 }
diff --git a/tags.csv b/tags.csv
index ef165c1..392f920 100644
--- a/tags.csv
+++ b/tags.csv
@@ -141,3 +141,4 @@ dark_date_picker_panel.css,popup,dark-mode
 textual_searchbar_one-offs.css,popup,menu
 menulike_bookmarks_folder_popups.css,menu,bookmarks,colors
 selected_tab_gradient_border.css,tab,colors,effect
+urlbar_container_color_border.css,colors,urlbar