New app icons

app/build.sh

@@ -455,10 +455,6 @@ cp "$CALLDIR/assets/updater.ini" "$base_dir"
 # Adjust chrome.manifest
 #perl -pi -e 's^(chrome|resource)/^jar:zotero.jar\!/$1/^g' "$BUILD_DIR/zotero/chrome.manifest"
 
-# Copy icons
-mkdir "$base_dir/chrome"
-cp -R "$CALLDIR/assets/icons" "$base_dir/chrome/icons"
-
 # Copy application.ini and modify
 cp "$CALLDIR/assets/application.ini" "$app_dir/application.ini"
 perl -pi -e "s/\{\{VERSION}}/$VERSION/" "$app_dir/application.ini"
@@ -863,6 +859,10 @@ if [ $BUILD_LINUX == 1 ]; then
 		mkdir "$APPDIR/integration"
 		cp -RH "$CALLDIR/modules/zotero-libreoffice-integration/install" "$APPDIR/integration/libreoffice"
 		
+		# Copy icons
+		cp "$CALLDIR/linux/icons/icon128.png" "$APPDIR/icons/"
+		cp "$CALLDIR/linux/icons/symbolic.svg" "$APPDIR/icons/"
+		
 		# Delete extraneous files
 		find "$APPDIR" -depth -type d -name .git -exec rm -rf {} \;
 		find "$APPDIR" \( -name .DS_Store -or -name update.rdf \) -exec rm -f {} \;

app/linux/icons/symbolic.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <polygon points="13.863 2.73 13.027 1 2.137 1 2.137 3.8 2.137 3.921 8.822 3.921 1.289 13.233 2.137 15 13.863 15 13.863 12.142 13.863 12.021 6.448 12.021 13.863 2.73"/>
+</svg>

app/linux/set_launcher_icon

@@ -6,7 +6,7 @@
 
 APPDIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
 if [ -w "$APPDIR"/zotero.desktop ]; then
-	sed -i -e "s@^Icon=.*@Icon=$APPDIR/chrome/icons/default/default256.png@" "$APPDIR"/zotero.desktop
+	sed -i -e "s@^Icon=.*@Icon=$APPDIR/icons/icon128.png@" "$APPDIR"/zotero.desktop
 else
 	echo "$APPDIR"/zotero.desktop is not writable
 	exit 1

app/win/resource-hacker-config.txt

@@ -3,7 +3,7 @@ Open=firefox-{{ARCH}}.exe
 Save=zotero_{{ARCH}}.exe
 Log=CONSOLE
 [COMMANDS]
--addoverwrite ../assets/icons/default/main-window.ico, ICONGROUP,1,
--addoverwrite ../assets/icons/default/main-window.ico, ICONGROUP,32512,
+-addoverwrite zotero.ico, ICONGROUP,1,
+-addoverwrite zotero.ico, ICONGROUP,32512,
 -delete VERSIONINFO,1
 -addoverwrite VersionInfo1.res, VERSIONINFO,1,

chrome/content/zotero/zoteroPane.xhtml

@@ -152,7 +152,7 @@
 	
 	<vbox id="titlebar">
 		<hbox class="titlebar-icon-container">
-			<image class="titlebar-icon" src="chrome://zotero/skin/zotero-new-z-16px.png"></image>
+			<image class="titlebar-icon" src="chrome://zotero/skin/z.svg"></image>
 		</hbox>
 		<hbox class="titlebar-buttonbox-container" skipintoolbarset="true">
 			<hbox class="titlebar-buttonbox titlebar-color">

chrome/skin/default/zotero/z.svg

@@ -0,0 +1,3 @@
+<svg xmlns="http://www.w3.org/2000/svg" width="16" height="16" viewBox="0 0 16 16">
+  <polygon fill="#cc2936" points="13.863 2.73 13.027 1 2.137 1 2.137 3.8 2.137 3.921 8.822 3.921 1.289 13.233 2.137 15 13.863 15 13.863 12.142 13.863 12.021 6.448 12.021 13.863 2.73"/>
+</svg>