diff --git a/Makefile.am b/Makefile.am
index 948a24ef8..cb54296cf 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,4 +1,4 @@
-SUBDIRS = src po help
+SUBDIRS = data src po help
 
 NULL =
 
diff --git a/configure.ac b/configure.ac
index 065fe9d40..26d967e17 100644
--- a/configure.ac
+++ b/configure.ac
@@ -303,6 +303,8 @@ AC_DEFINE_UNQUOTED([GDK_VERSION_MAX_ALLOWED],[G_ENCODE_VERSION($(echo $GTK_MAX_A
 AC_CONFIG_FILES([
 Makefile
 org.gnome.Terminal.desktop.in
+data/Makefile
+data/icons/Makefile
 src/Makefile
 src/terminal-version.h
 help/Makefile
diff --git a/data/Makefile.am b/data/Makefile.am
new file mode 100644
index 000000000..ed1988e3d
--- /dev/null
+++ b/data/Makefile.am
@@ -0,0 +1,3 @@
+NULL =
+
+SUBDIRS = icons
diff --git a/data/icons/Makefile.am b/data/icons/Makefile.am
new file mode 100644
index 000000000..bf6e58ad5
--- /dev/null
+++ b/data/icons/Makefile.am
@@ -0,0 +1,58 @@
+NULL =
+
+public_icons_themes = hicolor
+
+dist_noinst_DATA = \
+	hicolor_apps_16x16_org.gnome.Terminal.png \
+	hicolor_apps_22x22_org.gnome.Terminal.png \
+	hicolor_apps_24x24_org.gnome.Terminal.png \
+	hicolor_apps_32x32_org.gnome.Terminal.png \
+	hicolor_apps_48x48_org.gnome.Terminal.png \
+	hicolor_apps_512x512_org.gnome.Terminal.png \
+	hicolor_apps_symbolic_org.gnome.Terminal-symbolic.svg \
+	$(NULL)
+
+EXTRA_DIST = \
+	$(NULL)
+
+install-public-icons:
+	for icon in $(dist_noinst_DATA); do \
+		THEME=`echo $$icon | cut -d_ -f1`; \
+		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+		SIZE=`echo $$icon | cut -d_ -f3`; \
+		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+		$(MKDIR_P) $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT; \
+		$(INSTALL_DATA) $(srcdir)/$$icon $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+	done
+
+uninstall-public-icons:
+	-for icon in $(dist_noinst_DATA); do \
+		THEME=`echo $$icon | cut -d_ -f1`; \
+		CONTEXT=`echo $$icon | cut -d_ -f2`; \
+		SIZE=`echo $$icon | cut -d_ -f3`; \
+		ICONFILE=`echo $$icon | cut -d_ -f4`; \
+		rm -f $(DESTDIR)$(datadir)/icons/$$THEME/$$SIZE/$$CONTEXT/$$ICONFILE; \
+	done
+
+install-data-local: install-public-icons
+uninstall-local: uninstall-public-icons
+
+install-data-hook: update-icon-cache
+uninstall-hook: update-icon-cache
+
+gtk_update_icon_cache = gtk-update-icon-cache -f -t
+
+update-icon-cache:
+	@-if test -z "$(DESTDIR)"; then \
+		echo "Updating Gtk icon cache."; \
+		for theme in $(public_icons_themes); do \
+			$(gtk_update_icon_cache) $(datadir)/icons/$$theme; \
+		done; \
+	else \
+		echo "*** Icon cache not updated.  After (un)install, run this:"; \
+		for theme in $(public_icons_themes); do \
+			echo "***   $(gtk_update_icon_cache) $(datadir)/icons/$$theme"; \
+		done; \
+	fi
+
+-include $(top_srcdir)/git.mk
diff --git a/data/icons/hicolor_24x24_org.gnome.Terminal.png b/data/icons/hicolor_24x24_org.gnome.Terminal.png
new file mode 100644
index 000000000..cc404e54b
Binary files /dev/null and b/data/icons/hicolor_24x24_org.gnome.Terminal.png differ
diff --git a/data/icons/hicolor_apps_16x16_org.gnome.Terminal.png b/data/icons/hicolor_apps_16x16_org.gnome.Terminal.png
new file mode 100644
index 000000000..fd4c0337e
Binary files /dev/null and b/data/icons/hicolor_apps_16x16_org.gnome.Terminal.png differ
diff --git a/data/icons/hicolor_apps_22x22_org.gnome.Terminal.png b/data/icons/hicolor_apps_22x22_org.gnome.Terminal.png
new file mode 100644
index 000000000..441d1dc07
Binary files /dev/null and b/data/icons/hicolor_apps_22x22_org.gnome.Terminal.png differ
diff --git a/data/icons/hicolor_apps_32x32_org.gnome.Terminal.png b/data/icons/hicolor_apps_32x32_org.gnome.Terminal.png
new file mode 100644
index 000000000..24bb85606
Binary files /dev/null and b/data/icons/hicolor_apps_32x32_org.gnome.Terminal.png differ
diff --git a/data/icons/hicolor_apps_48x48_org.gnome.Terminal.png b/data/icons/hicolor_apps_48x48_org.gnome.Terminal.png
new file mode 100644
index 000000000..695b1dcd6
Binary files /dev/null and b/data/icons/hicolor_apps_48x48_org.gnome.Terminal.png differ
diff --git a/data/icons/hicolor_apps_512x512_org.gnome.Terminal.png b/data/icons/hicolor_apps_512x512_org.gnome.Terminal.png
new file mode 100644
index 000000000..c5be3ce5d
Binary files /dev/null and b/data/icons/hicolor_apps_512x512_org.gnome.Terminal.png differ
diff --git a/data/icons/hicolor_apps_symbolic_org.gnome.Terminal-symbolic.svg b/data/icons/hicolor_apps_symbolic_org.gnome.Terminal-symbolic.svg
new file mode 100644
index 000000000..13292c362
--- /dev/null
+++ b/data/icons/hicolor_apps_symbolic_org.gnome.Terminal-symbolic.svg
@@ -0,0 +1,32 @@
+<?xml version='1.0' encoding='UTF-8'?>
+<!-- Created with Inkscape (http://www.inkscape.org/) -->
+
+<svg xmlns:cc='http://creativecommons.org/ns#' xmlns:svg='http://www.w3.org/2000/svg' xmlns:inkscape='http://www.inkscape.org/namespaces/inkscape' id='svg7384' xmlns:sodipodi='http://sodipodi.sourceforge.net/DTD/sodipodi-0.dtd' version='1.1' inkscape:version='0.47 r22583' height='16.000019' sodipodi:docname='utilities-terminal-symbolic.svg' xmlns:dc='http://purl.org/dc/elements/1.1/' xmlns:rdf='http://www.w3.org/1999/02/22-rdf-syntax-ns#' xmlns='http://www.w3.org/2000/svg' width='16'>
+  <metadata id='metadata90'>
+    <rdf:RDF>
+      <cc:Work rdf:about=''>
+        <dc:format>image/svg+xml</dc:format>
+        <dc:type rdf:resource='http://purl.org/dc/dcmitype/StillImage'/>
+        <dc:title>Gnome Symbolic Icon Theme</dc:title>
+      </cc:Work>
+    </rdf:RDF>
+  </metadata>
+  <sodipodi:namedview inkscape:object-paths='true' inkscape:cy='-218.16054' inkscape:current-layer='layer11' inkscape:window-width='1920' pagecolor='#555753' showborder='false' showguides='true' inkscape:snap-nodes='false' objecttolerance='10' showgrid='true' inkscape:object-nodes='true' inkscape:pageshadow='2' inkscape:guide-bbox='true' inkscape:window-x='0' inkscape:snap-bbox='true' bordercolor='#666666' id='namedview88' inkscape:window-maximized='1' inkscape:snap-global='true' inkscape:window-y='26' gridtolerance='10' inkscape:zoom='1' inkscape:window-height='1021' borderopacity='1' guidetolerance='10' inkscape:snap-bbox-midpoints='false' inkscape:cx='-64.56688' inkscape:bbox-paths='false' inkscape:snap-grids='true' inkscape:pageopacity='1' inkscape:snap-to-guides='true'>
+    <inkscape:grid visible='true' spacingx='1px' type='xygrid' spacingy='1px' id='grid4866' empspacing='2' enabled='true' snapvisiblegridlinesonly='true'/>
+  </sodipodi:namedview>
+  <title id='title9167'>Gnome Symbolic Icon Theme</title>
+  <defs id='defs7386'/>
+  <g transform='translate(-122,-489.99998)' inkscape:groupmode='layer' id='layer9' inkscape:label='status' style='display:inline'/>
+  <g transform='translate(-122,-489.99998)' inkscape:groupmode='layer' id='layer10' inkscape:label='devices'/>
+  <g transform='translate(-122,-489.99998)' inkscape:groupmode='layer' id='layer11' inkscape:label='apps'>
+    <path d='M 124.1875,490 C 122.98196,490 122,491.01672 122,492.21875 l 0,10.5625 c 0,1.20203 0.98197,2.21875 2.1875,2.21875 l 11.625,0 c 1.20553,0 2.1875,-1.01671 2.1875,-2.21875 l 0,-10.5625 C 138,491.01671 137.01804,490 135.8125,490 l -11.625,0 z m 0,2 11.625,0 c 0.1228,0 0.1875,0.0809 0.1875,0.21875 l 0,10.5625 C 136,502.91909 135.93531,503 135.8125,503 l -11.625,0 C 124.06469,503 124,502.9191 124,502.78125 l 0,-10.5625 C 124,492.0809 124.0647,492 124.1875,492 z' id='rect11749-5-9' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:2;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans'/>
+    
+    <path d='m 126.3125,495.90625 a 0.60006002,0.60006002 0 0 0 -0.25,1.03125 l 1.5625,1.5625 -1.5625,1.5625 a 0.61871843,0.61871843 0 1 0 0.875,0.875 l 2,-2 a 0.60006002,0.60006002 0 0 0 0,-0.875 l -2,-2 a 0.60006002,0.60006002 0 0 0 -0.625,-0.15625 z' id='path11751-2-3' style='font-size:medium;font-style:normal;font-variant:normal;font-weight:normal;font-stretch:normal;text-indent:0;text-align:start;text-decoration:none;line-height:normal;letter-spacing:normal;word-spacing:normal;text-transform:none;direction:ltr;block-progression:tb;writing-mode:lr-tb;text-anchor:start;color:#bebebe;fill:#bebebe;fill-opacity:1;stroke:none;stroke-width:1.20000005;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate;font-family:Bitstream Vera Sans;-inkscape-font-specification:Bitstream Vera Sans'/>
+    <rect x='130' y='500' id='rect4987' height='1.00001' width='3' style='color:#bebebe;fill:#bebebe;fill-opacity:1;fill-rule:nonzero;stroke:none;stroke-width:1;marker:none;visibility:visible;display:inline;overflow:visible;enable-background:accumulate'/>
+  </g>
+  <g transform='translate(-122,-489.99998)' inkscape:groupmode='layer' id='layer12' inkscape:label='actions'/>
+  <g transform='translate(-122,-489.99998)' inkscape:groupmode='layer' id='layer13' inkscape:label='places'/>
+  <g transform='translate(-122,-489.99998)' inkscape:groupmode='layer' id='layer14' inkscape:label='mimetypes'/>
+  <g transform='translate(-122,-489.99998)' inkscape:groupmode='layer' id='layer15' inkscape:label='emblems' style='display:inline'/>
+  <g transform='translate(-122,-489.99998)' inkscape:groupmode='layer' id='g4953' inkscape:label='categories' style='display:inline'/>
+</svg>
diff --git a/org.gnome.Terminal.desktop.in.in b/org.gnome.Terminal.desktop.in.in
index 98ad8f9fe..779283033 100644
--- a/org.gnome.Terminal.desktop.in.in
+++ b/org.gnome.Terminal.desktop.in.in
@@ -4,7 +4,7 @@ _Comment=Use the command line
 _Keywords=shell;prompt;command;commandline;cmd;
 TryExec=gnome-terminal
 Exec=gnome-terminal
-Icon=utilities-terminal
+Icon=org.gnome.Terminal
 Type=Application
 X-GNOME-DocPath=gnome-terminal/index.html
 X-GNOME-Bugzilla-Bugzilla=GNOME