draw the embedded icon text in a sans-serif font. Also, added a bunch of

	draw the embedded icon text in a sans-serif font.  Also, added
	a bunch of new emblems from Susan.

24 files changed, 168 insertions, 42 deletions

diff --git a/ChangeLog b/ChangeLog
index 2bb0c6dea..8cadff17b 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,29 @@
+2000-08-02  Andy Hertzfeld  <andy@eazel.com>
+
+	* libnautilus-extensions/nautilus-icon-factory.c: (embed_text):
+	draw embedded text in a san-serif font, as suggested by Susan
+	
+	* data/emblems/Makefile.am:
+	* data/emblems/OK.png:
+	* data/emblems/draft.png:
+	* data/emblems/important.png:
+	* data/emblems/new.png
+	* data/emblems/personal.png:
+	* data/emblems/urgent.png:
+	* icons/Makefile.am:
+	* icons/eazel/i-directory.xml:
+	* icons/eazel/i-regular.xml:
+	* icons/emblem-OK.svg:
+	* icons/emblem-draft.svg:
+	* icons/emblem-important.svg:
+	* icons/emblem-new.svg:
+	* icons/emblem-noread.svg:
+	* icons/emblem-personal.svg:
+	* icons/emblem-urgent.svg:
+	added a bunch of new emblems from Susan and tweaked some offsets
+	in the xml files.
+	
+
 2000-08-02  Rebecca Schulman  <rebecka@eazel.com>
 	Completed bug 1433, the interface to search by file
 	name and attribute.  
diff --git a/data/emblems/Makefile.am b/data/emblems/Makefile.am
index 286aafdf8..cbbcd4693 100644
--- a/data/emblems/Makefile.am
+++ b/data/emblems/Makefile.am
@@ -6,9 +6,11 @@ emblems_DATA = \
 	confidential.gif \
 	draft.png \
 	favorite.png \
-	important.gif \
-	new.gif \
+	important.png \
+	new.png \
+	OK.png \
 	personal.png \
+	urgent.png \
 	$(NULL)
 
 EXTRA_DIST = $(emblems_DATA)
diff --git a/data/emblems/OK.png b/data/emblems/OK.png
new file mode 100644
index 000000000..992859641
--- /dev/null
+++ b/data/emblems/OK.png
diff --git a/data/emblems/draft.png b/data/emblems/draft.png
index 9618a2dac..74f3b4df3 100644
--- a/data/emblems/draft.png
+++ b/data/emblems/draft.png
diff --git a/data/emblems/important.gif b/data/emblems/important.gif
deleted file mode 100644
index 0351683a3..000000000
--- a/data/emblems/important.gif
+++ /dev/null
diff --git a/data/emblems/important.png b/data/emblems/important.png
new file mode 100644
index 000000000..a1def37bc
--- /dev/null
+++ b/data/emblems/important.png
diff --git a/data/emblems/new.gif b/data/emblems/new.gif
deleted file mode 100644
index e7539b852..000000000
--- a/data/emblems/new.gif
+++ /dev/null
diff --git a/data/emblems/new.png b/data/emblems/new.png
new file mode 100644
index 000000000..5203159cf
--- /dev/null
+++ b/data/emblems/new.png
diff --git a/data/emblems/personal.png b/data/emblems/personal.png
index 74d23c53f..efc81c810 100644
--- a/data/emblems/personal.png
+++ b/data/emblems/personal.png
diff --git a/data/emblems/urgent.png b/data/emblems/urgent.png
new file mode 100644
index 000000000..3b77242f2
--- /dev/null
+++ b/data/emblems/urgent.png
diff --git a/icons/Makefile.am b/icons/Makefile.am
index 6e357b841..6d542c7d0 100644
--- a/icons/Makefile.am
+++ b/icons/Makefile.am
@@ -22,14 +22,16 @@ icon_DATA =\
 	emblem-encrypted.gif \
 	emblem-favorite.svg \
 	emblem-generic.png \
-	emblem-important.gif \
-	emblem-new.gif \
-	emblem-noread.png \
+	emblem-important.svg \
+	emblem-new.svg \
+	emblem-noread.svg \
 	emblem-nowrite.png \
+	emblem-OK.svg \
 	emblem-personal.svg \
 	emblem-remote.gif \
 	emblem-trash.png \
 	emblem-symbolic-link.png \
+	emblem-urgent.svg \
 	emblems.png \
 	expert.png \
 	expert-selected.png \
diff --git a/icons/eazel/i-directory-aa.png b/icons/eazel/i-directory-aa.png
index 193954516..8158de40b 100644
--- a/icons/eazel/i-directory-aa.png
+++ b/icons/eazel/i-directory-aa.png
diff --git a/icons/eazel/i-directory-accept-72.png b/icons/eazel/i-directory-accept-72.png
index 033aeddd7..a610c0d8f 100644
--- a/icons/eazel/i-directory-accept-72.png
+++ b/icons/eazel/i-directory-accept-72.png
diff --git a/icons/eazel/i-directory.xml b/icons/eazel/i-directory.xml
index 0a7fb25e5..fe68e3953 100644
--- a/icons/eazel/i-directory.xml
+++ b/icons/eazel/i-directory.xml
@@ -1,8 +1,8 @@
 <?xml version="1.0"?>
 <ICON_SET>
   <ICON SIZE="24" ATTACH_POINTS="12,11|25,0|25,12|25,24"/>
-  <ICON SIZE="36" ATTACH_POINTS="18,17|38,0|38,20|38,40"/>
-  <ICON SIZE="48" ATTACH_POINTS="24,21|50,0|50,24|50,48"/>
-  <ICON SIZE="72" ATTACH_POINTS="33,31|76,0|76,32|76,64"/>
-  <ICON SIZE="96" ATTACH_POINTS="48,45|100,0|100,48|100,96"/>
+  <ICON SIZE="36" ATTACH_POINTS="20,17|38,0|38,20|38,40"/>
+  <ICON SIZE="48" ATTACH_POINTS="26,22|50,0|50,24|50,48"/>
+  <ICON SIZE="72" ATTACH_POINTS="36,32|76,0|76,32|76,64"/>
+  <ICON SIZE="96" ATTACH_POINTS="50,45|100,0|100,48|100,96"/>
 </ICON_SET>
diff --git a/icons/eazel/i-regular.xml b/icons/eazel/i-regular.xml
index 058145a0b..314adf146 100644
--- a/icons/eazel/i-regular.xml
+++ b/icons/eazel/i-regular.xml
@@ -2,6 +2,6 @@
 <ICON_SET>
   <ICON SIZE="36" EMBEDDED_TEXT_RECTANGLE="3,3,28,38"/>
   <ICON SIZE="48" EMBEDDED_TEXT_RECTANGLE="4,4,40,48"/>
-  <ICON SIZE="72" EMBEDDED_TEXT_RECTANGLE="4,4,60,76"/>
-  <ICON SIZE="96" EMBEDDED_TEXT_RECTANGLE="6,6,71,98"/>
+  <ICON SIZE="72" EMBEDDED_TEXT_RECTANGLE="8,8,56,72"/>
+  <ICON SIZE="96" EMBEDDED_TEXT_RECTANGLE="12,12,65,92"/>
 </ICON_SET>
diff --git a/icons/emblem-OK.svg b/icons/emblem-OK.svg
new file mode 100644
index 000000000..df50c1f28
--- /dev/null
+++ b/icons/emblem-OK.svg
@@ -0,0 +1,17 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN"   "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [
+	<!ENTITY st0 "fill-rule:nonzero;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st1 "fill:#3466DE;">
+	<!ENTITY st2 "stroke:none;">
+]>
+<svg  width="26pt" height="24pt" viewBox="0 0 26 24" xml:space="preserve">
+	<g id="Layer_x0020_1" style="&st0;">
+		<g style="&st2;">
+			<path style="&st1;" d="M19.454,3.337c4.451,4.45,4.449,11.666,0,16.117c-4.449,4.449-11.664,4.449-16.115,0c-4.451-4.451-4.451-11.667,0-16.116c4.451-4.45,11.666-4.45,16.115,0z"/>
+			<path d="M5.734,15.292c-0.642-0.643-2.193-1.994-0.974-3.213c1.152-1.152,2.592,0.354,3.256,1.02l2.128,2.127c0.798,0.799,1.927,1.95,0.82,3.059c-1.063,1.063-2.237,0-2.927-0.688l-2.304-2.305z M5.668,18.417c2.216,2.217,3.999,3.667,6.549,1.119
+				c2.546-2.549,1.096-4.332-1.121-6.549l-1.186-1.185c-2.184-2.049-3.923-3.457-6.403-0.976c-2.483,2.482-1.074,4.223,0.974,6.404l1.188,1.186z"/>
+			<path d="M16.116,15.237l-8.31-8.31l1.552-1.551l3.689,3.69l0.021-0.022c-0.41-0.897-0.742-2.028-1.02-2.97l-0.786-2.604l1.749-1.751l1.52,5.618l6.891,2.592l-1.75,1.751L14.93,9.864l0.355,1.44l2.381,2.382l-1.551,1.551z"/>
+		</g>
+	</g>
+</svg>
diff --git a/icons/emblem-draft.svg b/icons/emblem-draft.svg
index 6f2da1bda..112459c74 100644
--- a/icons/emblem-draft.svg
+++ b/icons/emblem-draft.svg
@@ -1,19 +1,22 @@
-<svg width="51" height="25">
- <!-- DraftEmblem62000.eps converted by ill2svg.pl -->
- <defs>
- </defs>
- <g> <!-- Layer: Layer 1 -->
-   <!-- 0 1 1 1 1 Ap -->
-  <g style="fill:none; stroke: #176ed5; stroke-width: 1.89; stroke-miterlimit: 4">
-   <path d="M38.519 23.773C44.565 23.773 49.465 18.875 49.465 12.83C49.465 6.785 44.565 1.884 38.519 1.884L12.297 1.884C6.252 1.884 1.352 6.785 1.352 12.83C1.352 18.875 6.252 23.773 12.297 23.773L38.519 23.773z"/>
-   <!-- 0 Ap -->
-  </g>
-  <g style="fill: #176ed5">
-   <path d="M9.554 10.268C10.86 10.268 11.084 11.869 11.084 13.02C11.084 14.017 10.86 15.645 9.554 15.659L9.554 10.268zM6.69 18.215L9.189 18.215C10.93 18.215 14.005 17.765 14.005 12.879C14.005 9.678 12.25 7.628 8.993 7.628L6.69 7.628L6.69 18.215z"/>
-   <path d="M18.245 12.514L18.245 9.903C19.031 9.861 19.593 10.254 19.593 11.181C19.593 11.869 19.185 12.528 18.428 12.528L18.245 12.514zM22.92 18.215L20.786 13.806C21.923 13.356 22.429 12.317 22.429 11.152C22.429 8.358 20.631 7.628 18.147 7.628L15.381 7.628L15.381 18.215L18.245 18.215L18.245 15.393C18.245 14.873 18.217 14.353 18.203 13.834L18.231 13.806L19.817 18.215L22.92 18.215z"/>
-   <path d="M26.697 14.606L27.09 12.149C27.202 11.489 27.272 10.815 27.357 10.155L27.385 10.155C27.455 10.815 27.511 11.489 27.596 12.149L27.904 14.606L26.697 14.606zM31.415 18.215L29.168 7.628L25.672 7.628L23.131 18.215L26.079 18.215L26.317 16.853L28.241 16.853L28.452 18.215L31.415 18.215z"/>
-   <path d="M32.356 18.215L32.356 7.628L37.409 7.628L37.409 10.127L35.219 10.127L35.219 11.658L37.268 11.658L37.268 14.157L35.219 14.157L35.219 18.215L32.356 18.215z"/>
-   <path d="M40.161 18.215L40.161 10.212L38.588 10.212L38.588 7.628L44.666 7.628L44.666 10.212L43.025 10.212L43.025 18.215L40.161 18.215z"/>
-  </g>
- </g>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN"   "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [
+	<!ENTITY st0 "fill:#FFFFFF;stroke:#274D8B;stroke-width:2;">
+	<!ENTITY st1 "fill:#FFFFFF;stroke:#274D8B;stroke-width:1.8646;">
+	<!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;fill:#274D8B;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st3 "stroke:none;">
+]>
+<svg  width="38pt" height="18pt" viewBox="0 0 38 18" xml:space="preserve">
+	<g id="Layer_x0020_1" style="&st2;">
+		<g style="&st3;">
+			<path style="&st1;" d="M25.573,15.512c4.008,0,7.256-3.248,7.256-7.256S29.581,1,25.573,1H8.186C4.18,1,0.931,4.249,0.931,8.256s3.249,7.256,7.255,7.256h17.387z"/>
+			<path style="&st0;" d="M26.047,15.512c4.008,0,7.256-3.248,7.256-7.256S30.055,1,26.047,1H8.661C4.655,1,1.406,4.249,1.406,8.256s3.249,7.256,7.255,7.256h17.387z"/>
+			<path d="M6.826,6.527c0.87,0,1.017,1.063,1.017,1.829c0,0.662-0.146,1.745-1.017,1.754V6.527z M4.922,11.809h1.662c1.156,0,3.201-0.299,3.201-3.546c0-2.128-1.168-3.49-3.333-3.49h-1.53v7.036z"/>
+			<path d="M12.604,8.02V6.284c0.521-0.028,0.895,0.234,0.895,0.849c0,0.457-0.271,0.896-0.773,0.896l-0.121-0.01z M15.709,11.809l-1.418-2.932c0.756-0.297,1.094-0.988,1.094-1.763c0-1.857-1.195-2.342-2.848-2.342H10.7v7.036h1.904V9.933
+				c0-0.346-0.021-0.69-0.028-1.036l0.017-0.02l1.057,2.932h2.061z"/>
+			<path d="M18.221,9.411l0.261-1.633c0.076-0.439,0.122-0.887,0.177-1.326h0.02c0.044,0.439,0.084,0.887,0.138,1.326l0.206,1.633h-0.801z M21.356,11.809l-1.494-7.036H17.54l-1.689,7.036h1.96l0.157-0.906h1.281l0.137,0.906h1.971z"/>
+			<path d="M21.983,11.809V4.773h3.358v1.661h-1.458v1.017h1.363v1.66h-1.363v2.698h-1.9z"/>
+			<path d="M27.17,11.809V6.49h-1.047V4.773h4.041V6.49h-1.092v5.319H27.17z"/>
+		</g>
+	</g>
 </svg>
diff --git a/icons/emblem-important.svg b/icons/emblem-important.svg
new file mode 100644
index 000000000..de24418b2
--- /dev/null
+++ b/icons/emblem-important.svg
@@ -0,0 +1,16 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN"   "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [
+	<!ENTITY st0 "fill:#D90000;stroke:none;">
+	<!ENTITY st1 "fill:#FFFFFF;stroke:#D40026;stroke-width:2.6552;">
+	<!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+]>
+<svg  width="26pt" height="26pt" viewBox="0 0 26 26" xml:space="preserve">
+	<g id="Layer_x0020_1" style="&st2;">
+		<g>
+			<path style="&st1;" d="M22.568,11.949c0,5.865-4.756,10.62-10.621,10.62S1.326,17.814,1.326,11.949c0-5.866,4.756-10.622,10.621-10.622s10.621,4.756,10.621,10.622z"/>
+			<path style="&st0;" d="M10.311,17.873c0-0.982,0.793-1.775,1.777-1.775c0.962,0,1.753,0.793,1.753,1.775c0,0.97-0.791,1.761-1.753,1.761c-0.984,0-1.777-0.791-1.777-1.761 M11.684,14.637c-0.198-4.227-1.448-7.005-1.448-8.07c0-1.023,0.848-1.755,1.853-1.755
+				c1.002,0,1.849,0.731,1.849,1.755c0,1.065-1.25,3.844-1.447,8.07h-0.806"/>
+		</g>
+	</g>
+</svg>
diff --git a/icons/emblem-new.svg b/icons/emblem-new.svg
new file mode 100644
index 000000000..e39a14882
--- /dev/null
+++ b/icons/emblem-new.svg
@@ -0,0 +1,24 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN"   "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [
+	<!ENTITY st0 "fill-rule:nonzero;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st1 "stroke:none;">
+	<!ENTITY st2 "fill:#409D27;">
+]>
+<svg  width="28pt" height="28pt" viewBox="0 0 28 28" xml:space="preserve">
+	<g id="Layer_x0020_1" style="&st0;">
+		<g style="&st1;">
+			<g>
+				<path style="&st2;" d="M24.99,12.495L12.494,24.991L0,12.495L12.496,0L24.99,12.495z"/>
+			</g>
+			<g>
+				<path d="M8.118,10.748c0.318,0.265,0.478,0.702,0.478,1.312v3.276H7.283v-2.958c0-0.256-0.033-0.452-0.101-0.589c-0.123-0.25-0.356-0.375-0.701-0.375c-0.424,0-0.715,0.183-0.872,0.549c-0.082,0.193-0.123,0.44-0.123,0.741v2.632H4.221v-4.859h1.219v0.713
+					c0.162-0.251,0.316-0.432,0.462-0.542c0.26-0.197,0.59-0.296,0.989-0.296c0.5,0,0.91,0.132,1.228,0.396z"/>
+				<path d="M12.939,10.578c0.338,0.151,0.617,0.39,0.837,0.716c0.198,0.288,0.327,0.622,0.386,1.001c0.034,0.223,0.048,0.543,0.042,0.961h-3.537c0.02,0.485,0.189,0.826,0.511,1.021c0.195,0.121,0.431,0.182,0.705,0.182c0.291,0,0.527-0.072,0.71-0.219
+					c0.099-0.078,0.187-0.188,0.263-0.328h1.28c-0.034,0.287-0.19,0.578-0.47,0.873c-0.434,0.471-1.041,0.705-1.821,0.705c-0.645,0-1.213-0.199-1.705-0.597s-0.738-1.044-0.738-1.94c0-0.839,0.222-1.483,0.667-1.932c0.444-0.448,1.021-0.672,1.731-0.672
+					c0.422,0,0.802,0.076,1.14,0.227z M11.025,11.683c-0.183,0.18-0.297,0.423-0.343,0.73h2.219c-0.023-0.327-0.139-0.576-0.344-0.746s-0.46-0.254-0.764-0.254c-0.33,0-0.587,0.09-0.769,0.27z"/>
+				<path d="M17.158,10.476h1.247l0.777,3.5l0.745-3.5h1.321l-1.39,4.859h-1.298l-0.785-3.54l-0.785,3.54h-1.318l-1.356-4.859h1.362l0.754,3.486l0.726-3.486z"/>
+			</g>
+		</g>
+	</g>
+</svg>
diff --git a/icons/emblem-noread.svg b/icons/emblem-noread.svg
new file mode 100644
index 000000000..efc34a41e
--- /dev/null
+++ b/icons/emblem-noread.svg
@@ -0,0 +1,19 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN"   "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [
+	<!ENTITY st0 "fill:none;stroke:#D90000;stroke-width:3.06;">
+	<!ENTITY st1 "fill-rule:nonzero;clip-rule:nonzero;fill:#FFFFFF;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st2 "stroke:none;">
+]>
+<svg  width="32pt" height="20pt" viewBox="0 0 32 20" xml:space="preserve">
+	<g id="Layer_x0020_1" style="&st1;">
+		<g style="&st2;">
+			<path d="M1.528,9.18c0,4.225,6.165,7.65,13.771,7.65s13.77-3.426,13.77-7.65c0-4.225-6.164-7.65-13.77-7.65S1.528,4.955,1.528,9.18z"/>
+			<path style="&st0;" d="M1.528,9.18c0,4.225,6.165,7.65,13.771,7.65s13.77-3.426,13.77-7.65c0-4.225-6.164-7.65-13.77-7.65S1.528,4.955,1.528,9.18z"/>
+			<path d="M8.414,8.415c0,3.802,3.082,6.885,6.885,6.885s6.885-3.083,6.885-6.885c0-3.803-3.082-6.885-6.885-6.885S8.414,4.612,8.414,8.415z"/>
+			<path style="&st0;" d="M8.414,8.415c0,3.802,3.082,6.885,6.885,6.885s6.885-3.083,6.885-6.885c0-3.803-3.082-6.885-6.885-6.885S8.414,4.612,8.414,8.415z"/>
+			<path d="M18.741,12.622l-7.268-8.797 M18.741,12.622"/>
+			<path style="&st0;" d="M18.741,12.622l-7.268-8.797 M18.741,12.622"/>
+		</g>
+	</g>
+</svg>
diff --git a/icons/emblem-personal.svg b/icons/emblem-personal.svg
index 8d1601740..cd00c79e0 100644
--- a/icons/emblem-personal.svg
+++ b/icons/emblem-personal.svg
@@ -1,12 +1,14 @@
-<svg width="27" height="29">
- <!-- PersonalEmblem.eps converted by ill2svg.pl -->
- <defs>
- </defs>
- <g> <!-- Layer: Layer 1 -->
-  <g style="fill: #295eaa">
-   <path d="M0.916 21.867C1.32 22.07 2.797 22.401 5.1 22.812C8.679 23.453 9.515 24.93 12.66 26.727C14.079 27.538 15.9 28.348 16.508 28.415C19.798 28.781 20.495 27.555 22.312 26.863C25.147 25.783 25.958 24.433 26.329 21.969C26.722 19.364 25.822 18.29 23.798 13.97C22.751 11.739 22.167 7.167 21.594 4.155C20.978 0.917 18.583 1.333 18.827 4.223C19.044 6.784 19.167 7.25 19.343 9.717C19.459 11.346 18.75 10.5 18.25 9.25C16.928 5.945 16.5 4.25 15.5 2.167C14.135 -0.677 11.917 -0.083 12.823 3.194C13.366 5.158 16.374 11.742 14.989 11.641C14.456 11.602 10.433 3.845 8.407 1.313C6.965 -0.489 5.572 0.403 5.572 1.719C5.572 2.971 11.647 12.755 11.243 13.261C10.749 13.878 8.103 9.92 5.876 7.186C3.748 4.574 2.535 4.655 1.929 6.073C1.32 7.49 8.206 16.198 9.017 17.817C9.825 19.438 9.228 19.731 7.699 19.539C6.079 19.336 4.628 18.898 2.198 19.505C0.866 19.838 0.173 21.328 0.916 21.867z"/>
-   <!-- 0 1 1 1 0.8824 0.4431 0.0431 0.0078 (N) * -->
-   <!-- (N) * -->
-  </g>
- </g>
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN"   "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [
+	<!ENTITY st0 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+	<!ENTITY st1 "fill:#2A5FAA;stroke:none;">
+]>
+<svg  width="21.444pt" height="23.685pt" viewBox="0 0 21.444 23.685" xml:space="preserve">
+	<g id="Layer_x0020_1" style="&st0;">
+		<path style="&st1;" d="M0,18.16c0.341,0.171,1.587,0.45,3.53,0.798c3.021,0.54,3.728,1.787,6.38,3.304c1.196,0.685,2.733,1.366,3.246,1.424c2.776,0.31,3.366-0.726,4.898-1.31c2.393-0.911,3.077-2.051,3.39-4.131c0.332-2.197-0.428-3.104-2.135-6.749
+			c-0.884-1.882-1.377-5.741-1.861-8.282c-0.52-2.732-2.539-2.381-2.334,0.058c0.182,2.161,0.287,2.554,0.436,4.636c0.099,1.374-0.501,0.66-0.923-0.395c-1.114-2.79-1.476-4.219-2.321-5.977c-1.15-2.401-3.021-1.899-2.258,0.867c0.459,1.657,2.996,7.213,1.828,7.128
+			c-0.449-0.033-3.844-6.579-5.555-8.715C5.104-0.705,3.929,0.047,3.929,1.157c0,1.057,5.127,9.313,4.785,9.741c-0.416,0.521-2.648-2.82-4.529-5.126c-1.793-2.204-2.818-2.137-3.33-0.939c-0.514,1.195,5.297,8.543,5.98,9.911c0.683,1.367,0.179,1.614-1.111,1.452
+			c-1.365-0.171-2.59-0.542-4.641-0.028C-0.042,16.448-0.628,17.705,0,18.16z"/>
+	</g>
 </svg>
diff --git a/icons/emblem-urgent.svg b/icons/emblem-urgent.svg
new file mode 100644
index 000000000..1680613d4
--- /dev/null
+++ b/icons/emblem-urgent.svg
@@ -0,0 +1,15 @@
+<?xml version="1.0" encoding="iso-8859-1"?>
+<!-- Generator: Adobe Illustrator 9.0, SVG Export Plug-In  -->
+<!DOCTYPE svg PUBLIC "-//W3C//DTD SVG 20000303 Stylable//EN"   "http://www.w3.org/TR/2000/03/WD-SVG-20000303/DTD/svg-20000303-stylable.dtd" [
+	<!ENTITY st0 "fill:#FF4F00;stroke:none;">
+	<!ENTITY st1 "fill:#FFFFFF;stroke:#FF4F00;stroke-width:3;">
+	<!ENTITY st2 "fill-rule:nonzero;clip-rule:nonzero;stroke:#000000;stroke-miterlimit:4;">
+]>
+<svg  width="26pt" height="26pt" viewBox="0 0 26 26" xml:space="preserve">
+	<g id="Layer_x0020_1" style="&st2;">
+		<g>
+			<path style="&st1;" d="M22.723,12.112c0,5.862-4.752,10.614-10.613,10.614c-5.86,0-10.611-4.752-10.611-10.614C1.498,6.251,6.249,1.5,12.109,1.5c5.861,0,10.613,4.752,10.613,10.613z"/>
+			<path style="&st0;" d="M10.998,13.824l-0.438-0.421v-0.607h1.434h-1.434l0.017-8.869l2.859,0.008l-0.008,8.256l4.471,4.323l-1.984,2.058l-4.917-4.747"/>
+		</g>
+	</g>
+</svg>
diff --git a/libnautilus-extensions/nautilus-icon-factory.c b/libnautilus-extensions/nautilus-icon-factory.c
index 62d4966bc..25032cbc3 100644
--- a/libnautilus-extensions/nautilus-icon-factory.c
+++ b/libnautilus-extensions/nautilus-icon-factory.c
@@ -2213,7 +2213,7 @@ embed_text (GdkPixbuf *pixbuf_without_text,
 		/* FIXME bugzilla.eazel.com 1102: Embedded text should use preferences to determine
 		 * the font it uses
 		 */
-		font = gdk_font_load ("-bitstream-charter-medium-r-normal-*-9-*-*-*-*-*-*-*");
+		font = gdk_font_load ("-*-helvetica-medium-r-normal-*-9-*-*-*-*-*-*-*");
 		g_return_val_if_fail (font != NULL, gdk_pixbuf_ref (pixbuf_without_text));
 	}
 
diff --git a/libnautilus-private/nautilus-icon-factory.c b/libnautilus-private/nautilus-icon-factory.c
index 62d4966bc..25032cbc3 100644
--- a/libnautilus-private/nautilus-icon-factory.c
+++ b/libnautilus-private/nautilus-icon-factory.c
@@ -2213,7 +2213,7 @@ embed_text (GdkPixbuf *pixbuf_without_text,
 		/* FIXME bugzilla.eazel.com 1102: Embedded text should use preferences to determine
 		 * the font it uses
 		 */
-		font = gdk_font_load ("-bitstream-charter-medium-r-normal-*-9-*-*-*-*-*-*-*");
+		font = gdk_font_load ("-*-helvetica-medium-r-normal-*-9-*-*-*-*-*-*-*");
 		g_return_val_if_fail (font != NULL, gdk_pixbuf_ref (pixbuf_without_text));
 	}