From 00d817a56af9465e4f86c60275e8fd94d2fae53e Mon Sep 17 00:00:00 2001
From: Phil Lello <philipl@catalyst-eu.net>
Date: Mon, 14 Jul 2014 05:15:11 +0100
Subject: [PATCH] Move resources from gerrit-gwtui to gerrit-gwtui-common

This allows plugins to use the standard Gerrit icons.

There is now a single place were icons are stored (in
com.google.gerrit.client in gerrit-gwtui-common). Before they were
distributed over different packages. An exception are a few icons in
com.google.gerrit.client.admin and com.google.gerrit.client.diff which
cannot be moved since they are referenced from a css file in the same
package (at least I don't know how to link to the icons in
gerrit-gwtui-common from the css files).

The icon names were made consistent, duplicate icons were deleted and
the icons are also moved from src/main/java/ to src/main/resources/.

In addition the only gif icon was converted to png.

Change-Id: Ibd9475ae175de6acc7c36bf2e40f96b003f2af10
---
 gerrit-gwtui-common/BUCK                      |  24 ++++
 .../com/google/gerrit/client/Resources.java   | 104 ++++++++++++++++++
 .../google/gerrit/client/addFileComment.png   | Bin
 .../com/google/gerrit/client/arrowDown.png    | Bin
 .../com/google/gerrit/client/arrowRight.png   | Bin 0 -> 2780 bytes
 .../com/google/gerrit/client/arrowUp.png      | Bin
 .../com/google/gerrit/client/deleteHover.png  | Bin 0 -> 313 bytes
 .../com/google/gerrit/client/deleteNormal.png | Bin 0 -> 334 bytes
 .../com/google/gerrit/client/diffy100.png     | Bin
 .../com/google/gerrit/client/diffy26.png      | Bin
 .../com/google/gerrit/client/downloadIcon.png | Bin
 .../google/gerrit/client/draftComments.png    | Bin
 .../com/google/gerrit/client}/editText.png    | Bin
 .../com/google/gerrit/client/editUndo.png     | Bin
 .../com/google/gerrit/client}/gear.png        | Bin
 .../com/google/gerrit/client/goNext.png       | Bin
 .../com/google/gerrit/client/goPrev.png       | Bin
 .../com/google/gerrit/client/goUp.png         | Bin
 .../com/google/gerrit/client/greenCheck.png   | Bin
 .../com/google/gerrit/client/info.png         | Bin
 .../com/google/gerrit/client/listAdd.png      | Bin
 .../com/google/gerrit/client/mediaFloppy.png  | Bin
 .../com/google/gerrit/client/merge.png        | Bin
 .../com/google/gerrit/client/queryIcon.png    | Bin
 .../com/google/gerrit/client/readOnly.png     | Bin
 .../com/google/gerrit/client/redNot.png       | Bin
 .../google/gerrit/client/removeReviewer.png   | Bin
 .../com/google/gerrit/client/starFilled.png   | Bin
 .../com/google/gerrit/client/starOpen.png     | Bin
 .../com/google/gerrit/client/undoNormal.png   | Bin 0 -> 504 bytes
 .../com/google/gerrit/client/warning.png      | Bin
 gerrit-gwtui/BUCK                             |  27 +----
 .../google/gerrit/client/GerritResources.java |  67 +----------
 .../gerrit/client/admin/AdminResources.java   |   3 -
 .../gerrit/client/admin/ValueEditor.ui.xml    |   4 +-
 .../com/google/gerrit/client/arrowRight.gif   | Bin 78 -> 0 bytes
 .../gerrit/client/change/CommitBox.ui.xml     |   2 +-
 .../google/gerrit/client/change/Hashtags.java |   2 +-
 .../google/gerrit/client/change/Labels.java   |   2 +-
 .../gerrit/client/change/Resources.java       |   4 -
 .../google/gerrit/client/change/StarIcon.java |   5 +-
 .../change/{more_less.png => moreLess.png}    | Bin
 .../gerrit/client/diff/CommentBoxUi.css       |  12 +-
 .../google/gerrit/client/diff/Header.ui.xml   |   9 +-
 .../google/gerrit/client/diff/Resources.java  |  13 +--
 .../com/google/gerrit/client/diff/goNext.png  | Bin 0 -> 623 bytes
 .../com/google/gerrit/client/diff/goPrev.png  | Bin 0 -> 609 bytes
 .../com/google/gerrit/client/diff/goUp.png    | Bin 0 -> 637 bytes
 .../com/google/gerrit/client/editText.png     | Bin 409 -> 0 bytes
 .../java/com/google/gerrit/client/gear.png    | Bin 246 -> 0 bytes
 .../com/google/gerrit/client/starFilled.gif   | Bin 171 -> 0 bytes
 .../com/google/gerrit/client/starOpen.gif     | Bin 179 -> 0 bytes
 52 files changed, 156 insertions(+), 122 deletions(-)
 create mode 100644 gerrit-gwtui-common/src/main/java/com/google/gerrit/client/Resources.java
 rename {gerrit-gwtui/src/main/java => gerrit-gwtui-common/src/main/resources}/com/google/gerrit/client/addFileComment.png (100%)
 rename {gerrit-gwtui/src/main/java => gerrit-gwtui-common/src/main/resources}/com/google/gerrit/client/arrowDown.png (100%)
 create mode 100644 gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/arrowRight.png
 rename {gerrit-gwtui/src/main/java => gerrit-gwtui-common/src/main/resources}/com/google/gerrit/client/arrowUp.png (100%)
 create mode 100644 gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/deleteHover.png
 create mode 100644 gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/deleteNormal.png
 rename {gerrit-gwtui/src/main/java => gerrit-gwtui-common/src/main/resources}/com/google/gerrit/client/diffy100.png (100%)
 rename {gerrit-gwtui/src/main/java => gerrit-gwtui-common/src/main/resources}/com/google/gerrit/client/diffy26.png (100%)
 rename {gerrit-gwtui/src/main/java => gerrit-gwtui-common/src/main/resources}/com/google/gerrit/client/downloadIcon.png (100%)
 rename {gerrit-gwtui/src/main/java => gerrit-gwtui-common/src/main/resources}/com/google/gerrit/client/draftComments.png (100%)
 rename {gerrit-gwtui/src/main/java/com/google/gerrit/client/admin => gerrit-gwtui-common/src/main/resources/com/google/gerrit/client}/editText.png (100%)
 rename {gerrit-gwtui/src/main/java => gerrit-gwtui-common/src/main/resources}/com/google/gerrit/client/editUndo.png (100%)
 rename {gerrit-gwtui/src/main/java/com/google/gerrit/client/diff => gerrit-gwtui-common/src/main/resources/com/google/gerrit/client}/gear.png (100%)
 rename gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/go-next.png => gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/goNext.png (100%)
 rename gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/go-prev.png => gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/goPrev.png (100%)
 rename gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/go-up.png => gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/goUp.png (100%)
 rename {gerrit-gwtui/src/main/java => gerrit-gwtui-common/src/main/resources}/com/google/gerrit/client/greenCheck.png (100%)
 rename {gerrit-gwtui/src/main/java => gerrit-gwtui-common/src/main/resources}/com/google/gerrit/client/info.png (100%)
 rename {gerrit-gwtui/src/main/java => gerrit-gwtui-common/src/main/resources}/com/google/gerrit/client/listAdd.png (100%)
 rename {gerrit-gwtui/src/main/java => gerrit-gwtui-common/src/main/resources}/com/google/gerrit/client/mediaFloppy.png (100%)
 rename {gerrit-gwtui/src/main/java => gerrit-gwtui-common/src/main/resources}/com/google/gerrit/client/merge.png (100%)
 rename {gerrit-gwtui/src/main/java => gerrit-gwtui-common/src/main/resources}/com/google/gerrit/client/queryIcon.png (100%)
 rename {gerrit-gwtui/src/main/java => gerrit-gwtui-common/src/main/resources}/com/google/gerrit/client/readOnly.png (100%)
 rename {gerrit-gwtui/src/main/java => gerrit-gwtui-common/src/main/resources}/com/google/gerrit/client/redNot.png (100%)
 rename gerrit-gwtui/src/main/java/com/google/gerrit/client/change/remove_reviewer.png => gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/removeReviewer.png (100%)
 rename gerrit-gwtui/src/main/java/com/google/gerrit/client/change/star_filled.png => gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/starFilled.png (100%)
 rename gerrit-gwtui/src/main/java/com/google/gerrit/client/change/star_open.png => gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/starOpen.png (100%)
 create mode 100644 gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/undoNormal.png
 rename {gerrit-gwtui/src/main/java => gerrit-gwtui-common/src/main/resources}/com/google/gerrit/client/warning.png (100%)
 delete mode 100644 gerrit-gwtui/src/main/java/com/google/gerrit/client/arrowRight.gif
 rename gerrit-gwtui/src/main/java/com/google/gerrit/client/change/{more_less.png => moreLess.png} (100%)
 create mode 100644 gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/goNext.png
 create mode 100644 gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/goPrev.png
 create mode 100644 gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/goUp.png
 delete mode 100644 gerrit-gwtui/src/main/java/com/google/gerrit/client/editText.png
 delete mode 100644 gerrit-gwtui/src/main/java/com/google/gerrit/client/gear.png
 delete mode 100644 gerrit-gwtui/src/main/java/com/google/gerrit/client/starFilled.gif
 delete mode 100644 gerrit-gwtui/src/main/java/com/google/gerrit/client/starOpen.gif

diff --git a/gerrit-gwtui-common/BUCK b/gerrit-gwtui-common/BUCK
index f4c2358870..2eb068401d 100644
--- a/gerrit-gwtui-common/BUCK
+++ b/gerrit-gwtui-common/BUCK
@@ -1,9 +1,11 @@
 SRC = 'src/main/java/com/google/gerrit/'
+DIFFY = glob(['src/main/resources/com/google/gerrit/client/diffy*.png'])
 
 gwt_module(
   name = 'client',
   srcs = glob([SRC + 'client/**/*.java']),
   gwt_xml = SRC + 'GerritGwtUICommon.gwt.xml',
+  resources = glob(['src/main/**/*']),
   deps = ['//lib/gwt:user'],
   visibility = ['PUBLIC'],
 )
@@ -28,3 +30,25 @@ java_library(
   resources = glob(['src/main/**/*']),
   visibility = ['PUBLIC'],
 )
+
+prebuilt_jar(
+  name = 'diffy_logo',
+  binary_jar = ':diffy_image_files_ln',
+  deps = [
+    '//lib:LICENSE-diffy',
+    '//lib:LICENSE-CC-BY3.0',
+  ],
+  visibility = ['PUBLIC'],
+)
+
+genrule(
+  name = 'diffy_image_files_ln',
+  cmd = 'ln -s $(location :diffy_image_files) $OUT',
+  deps = [':diffy_image_files'],
+  out = 'diffy_images.jar',
+)
+
+java_library(
+  name = 'diffy_image_files',
+  resources = DIFFY,
+)
diff --git a/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/Resources.java b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/Resources.java
new file mode 100644
index 0000000000..0c728ae063
--- /dev/null
+++ b/gerrit-gwtui-common/src/main/java/com/google/gerrit/client/Resources.java
@@ -0,0 +1,104 @@
+// Copyright (C) 2008 The Android Open Source Project
+//
+// Licensed under the Apache License, Version 2.0 (the "License");
+// you may not use this file except in compliance with the License.
+// You may obtain a copy of the License at
+//
+// http://www.apache.org/licenses/LICENSE-2.0
+//
+// Unless required by applicable law or agreed to in writing, software
+// distributed under the License is distributed on an "AS IS" BASIS,
+// WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+// See the License for the specific language governing permissions and
+// limitations under the License.
+
+package com.google.gerrit.client;
+
+import com.google.gwt.resources.client.ClientBundle;
+import com.google.gwt.resources.client.ImageResource;
+
+public interface Resources extends ClientBundle {
+  @Source("arrowRight.png")
+  public ImageResource arrowRight();
+
+  @Source("arrowUp.png")
+  public ImageResource arrowUp();
+
+  @Source("arrowDown.png")
+  public ImageResource arrowDown();
+
+  @Source("editText.png")
+  public ImageResource edit();
+
+  @Source("mediaFloppy.png")
+  public ImageResource save();
+
+  @Source("starOpen.png")
+  public ImageResource starOpen();
+
+  @Source("starFilled.png")
+  public ImageResource starFilled();
+
+  @Source("greenCheck.png")
+  public ImageResource greenCheck();
+
+  @Source("redNot.png")
+  public ImageResource redNot();
+
+  @Source("editUndo.png")
+  public ImageResource editUndo();
+
+  @Source("downloadIcon.png")
+  public ImageResource downloadIcon();
+
+  @Source("queryIcon.png")
+  public ImageResource queryIcon();
+
+  @Source("addFileComment.png")
+  public ImageResource addFileComment();
+
+  @Source("diffy26.png")
+  public ImageResource gerritAvatar26();
+
+  @Source("draftComments.png")
+  public ImageResource draftComments();
+
+  @Source("readOnly.png")
+  public ImageResource readOnly();
+
+  @Source("gear.png")
+  public ImageResource gear();
+
+  @Source("info.png")
+  public ImageResource info();
+
+  @Source("warning.png")
+  public ImageResource warning();
+
+  @Source("listAdd.png")
+  public ImageResource listAdd();
+
+  @Source("merge.png")
+  public ImageResource merge();
+
+  @Source("removeReviewer.png")
+  public ImageResource removeReviewer();
+
+  @Source("deleteNormal.png")
+  public ImageResource deleteNormal();
+
+  @Source("deleteHover.png")
+  public ImageResource deleteHover();
+
+  @Source("undoNormal.png")
+  public ImageResource undoNormal();
+
+  @Source("goPrev.png")
+  public ImageResource goPrev();
+
+  @Source("goNext.png")
+  public ImageResource goNext();
+
+  @Source("goUp.png")
+  public ImageResource goUp();
+}
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/addFileComment.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/addFileComment.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/addFileComment.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/addFileComment.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/arrowDown.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/arrowDown.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/arrowDown.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/arrowDown.png
diff --git a/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/arrowRight.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/arrowRight.png
new file mode 100644
index 0000000000000000000000000000000000000000..8549f5d3869065c89d6740c2aea7ea107ce7c048
GIT binary patch
literal 2780
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

literal 0
HcmV?d00001

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/arrowUp.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/arrowUp.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/arrowUp.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/arrowUp.png
diff --git a/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/deleteHover.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/deleteHover.png
new file mode 100644
index 0000000000000000000000000000000000000000..9fde3fa5210d1ec4c6a8e72cd306767e264c35b3
GIT binary patch
literal 313
zcmV-90mlA`P)<h;3K|Lk000e1NJLTq000gE000gM0{{R3D3;yh0001QP)t-skB^U!
zkB?kjT;}HH?d|R0;Na=$>Dt=bkdTn@@bLNh`QF~%<KyF~sHmZ#p`M<erlzK;si~l#
zp!4(d*x1;mrKRfX>fPPl@9*#O^77>5<fEgbtE;Q__V%5for;Qz`uh6R)YQ|{)4#vJ
z!NI}U5Y?>!0007XQchF2KrB<J7ytkOcS%G+RCr!pk2ey-Kn%p_<wfNj9mD_M=#`2q
zjNvQ>CFLTI1Vi4>#7iWs*)=<$)*xYN(cTEPFil^g?9VaGDaHm3FUE<f#+VTpDP?ZX
zxgFT4jcHXYR6JG7oQn=!an8*2HEK&J&m8i5en1UD<l_@x`Fr69;Did_ku9sQ00000
LNkvXXu0mjf0>q-F

literal 0
HcmV?d00001

diff --git a/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/deleteNormal.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/deleteNormal.png
new file mode 100644
index 0000000000000000000000000000000000000000..47a1195789ab737dbede763f313eed496884f8ab
GIT binary patch
literal 334
zcmeAS@N?(olHy`uVBq!ia0vp^d?3uh3?wzC-F*zCasqrpT)Vou`uqEzJ$v@{?b`_x
zCOmlX;MT2MFJHd=@ZrO~d-s0+{Q3Ct<IkTz-?(w()vH%`@7{g?{{5#<pPoE<^6lHV
zU%!4`xpL+5<;(l`?>~6(U`$NRym|AMEnBv7<;n#M7A#)8c;Ui@D^{#nx^(H>xpP;q
zUY%Czv=wNtWJ!=;Fp$O${Qale17#{aT^vIy;$r*Vg_<3BSi*04@bx(#`}beow&1}7
zy{S>PQv?mg_dKoKU(rz*`|m9OigS|J{buB~WX;@mXT#Lzo6cA*6;xJVI&0;%Te3Ga
zQ@<G=V~tob?`3HC8kx}ZIbD*)h3ncR*?8s!G)AV*f77sP&cyH?6{qiW+Z*2GoEh->
R&liyEJYD@<);T3K0RVZ-p_%{y

literal 0
HcmV?d00001

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diffy100.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/diffy100.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/diffy100.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/diffy100.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diffy26.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/diffy26.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/diffy26.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/diffy26.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/downloadIcon.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/downloadIcon.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/downloadIcon.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/downloadIcon.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/draftComments.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/draftComments.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/draftComments.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/draftComments.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/editText.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/editText.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/editText.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/editText.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editUndo.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/editUndo.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/editUndo.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/editUndo.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/gear.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/gear.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/gear.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/gear.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/go-next.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/goNext.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/go-next.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/goNext.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/go-prev.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/goPrev.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/go-prev.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/goPrev.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/go-up.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/goUp.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/go-up.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/goUp.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/greenCheck.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/greenCheck.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/greenCheck.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/greenCheck.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/info.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/info.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/info.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/info.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/listAdd.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/listAdd.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/listAdd.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/listAdd.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/mediaFloppy.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/mediaFloppy.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/mediaFloppy.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/mediaFloppy.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/merge.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/merge.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/merge.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/merge.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/queryIcon.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/queryIcon.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/queryIcon.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/queryIcon.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/readOnly.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/readOnly.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/readOnly.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/readOnly.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/redNot.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/redNot.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/redNot.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/redNot.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/remove_reviewer.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/removeReviewer.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/change/remove_reviewer.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/removeReviewer.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/star_filled.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/starFilled.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/change/star_filled.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/starFilled.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/star_open.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/starOpen.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/change/star_open.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/starOpen.png
diff --git a/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/undoNormal.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/undoNormal.png
new file mode 100644
index 0000000000000000000000000000000000000000..b780f7560c09891d0ea7da213fdff8ef884ea314
GIT binary patch
literal 504
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMfs{o%6S0G(m$qGcf=Zo%MD1C6T
zNKF;no`oX&=Q4bMk+W~1@Z)oi2Nw$i71V*19bGNGXMyP6g<|^`OCMMwbz}j<&Y28A
z^58s%PtQ9}ui|@oEB3%LWuVCIBhELDIz!m6Zl@huCU|(6#F6D7EkN|~w&t}1EZ-j)
z{r<f6%}ui(kBq)P(0_4B_V?SeBP$tCtYLchFz^0J{!dRbKR?a-`6~0*>-_I8^1eRH
zegCNJ;9|*Jhgp6<QT=|G_0S^0Z_hLDpWyoTK>x-e_Fs<`e!VGvc-G<ZS+Uo5@_)ar
z{BmFC+e5?qC%8YC&JF<jR=p(1FPK4)>->_d+*d??JpcE^NKod-=~G{R7zCV@`uFeO
zd!;}B>SH&p%gmIhk{6u|)H2P}#WAEJF1G(DACsd1t9<wF-P!B8-@W_vfB)eYMHT0}
ztN7;DJrH1FQehL%{PH||(S+NNfB*bkGVfedUA_!Y=ay!z*`Gr1w<-rRoZ$^MO+CHo
zi?<h3Qi-`-*P;y{q|_(Pm;QEYo`Ko#$GW_6IY}1H4>g+e6%}TmJ}>TF@MC#vT_Ja(
s_sSSSwUF$uZ345_nz2~jmHWVUyGi(FOKR+4pbHs1UHx3vIVCg!01V6X%K!iX

literal 0
HcmV?d00001

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/warning.png b/gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/warning.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/warning.png
rename to gerrit-gwtui-common/src/main/resources/com/google/gerrit/client/warning.png
diff --git a/gerrit-gwtui/BUCK b/gerrit-gwtui/BUCK
index 413360645e..12945fa113 100644
--- a/gerrit-gwtui/BUCK
+++ b/gerrit-gwtui/BUCK
@@ -59,16 +59,14 @@ gwt_user_agent_permutations(
   visibility = ['//:'],
 )
 
-DIFFY = glob(['src/main/java/com/google/gerrit/client/diffy*.png'])
-
 gwt_module(
   name = 'ui_module',
   srcs = glob(['src/main/java/**/*.java']),
   gwt_xml = 'src/main/java/%s.gwt.xml' % MODULE.replace('.', '/'),
-  resources = glob(['src/main/java/**/*'], excludes = DIFFY),
+  resources = glob(['src/main/java/**/*']),
   deps = [
-    ':diffy_logo',
     ':freebie_application_icon_set',
+    '//gerrit-gwtui-common:diffy_logo',
     '//gerrit-gwtexpui:Clippy',
     '//gerrit-gwtexpui:GlobalKey',
     '//gerrit-gwtexpui:Progress',
@@ -94,15 +92,6 @@ gwt_module(
   ],
 )
 
-prebuilt_jar(
-  name = 'diffy_logo',
-  binary_jar = ':diffy_image_files_ln',
-  deps = [
-    '//lib:LICENSE-diffy',
-    '//lib:LICENSE-CC-BY3.0',
-  ],
-)
-
 java_library(
   name = 'freebie_application_icon_set',
   deps = [
@@ -111,18 +100,6 @@ java_library(
   ],
 )
 
-genrule(
-  name = 'diffy_image_files_ln',
-  cmd = 'ln -s $(location :diffy_image_files) $OUT',
-  deps = [':diffy_image_files'],
-  out = 'diffy_images.jar',
-)
-
-java_library(
-  name = 'diffy_image_files',
-  resources = DIFFY,
-)
-
 java_test(
   name = 'ui_tests',
   srcs = glob(['src/test/java/**/*.java']),
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java
index c45c797735..01be2f2381 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/GerritResources.java
@@ -14,77 +14,12 @@
 
 package com.google.gerrit.client;
 
-import com.google.gwt.resources.client.ClientBundle;
 import com.google.gwt.resources.client.CssResource;
-import com.google.gwt.resources.client.ImageResource;
 
-public interface GerritResources extends ClientBundle {
+public interface GerritResources extends Resources {
   @Source("gerrit.css")
   GerritCss css();
 
   @Source("gwt_override.css")
   CssResource gwt_override();
-
-  @Source("arrowRight.gif")
-  public ImageResource arrowRight();
-
-  @Source("arrowUp.png")
-  public ImageResource arrowUp();
-
-  @Source("arrowDown.png")
-  public ImageResource arrowDown();
-
-  @Source("editText.png")
-  public ImageResource edit();
-
-  @Source("mediaFloppy.png")
-  public ImageResource save();
-
-  @Source("starOpen.gif")
-  public ImageResource starOpen();
-
-  @Source("starFilled.gif")
-  public ImageResource starFilled();
-
-  @Source("greenCheck.png")
-  public ImageResource greenCheck();
-
-  @Source("redNot.png")
-  public ImageResource redNot();
-
-  @Source("editUndo.png")
-  public ImageResource editUndo();
-
-  @Source("downloadIcon.png")
-  public ImageResource downloadIcon();
-
-  @Source("queryIcon.png")
-  public ImageResource queryIcon();
-
-  @Source("addFileComment.png")
-  public ImageResource addFileComment();
-
-  @Source("diffy26.png")
-  public ImageResource gerritAvatar26();
-
-  @Source("draftComments.png")
-  public ImageResource draftComments();
-
-  @Source("readOnly.png")
-  public ImageResource readOnly();
-
-  @Source("gear.png")
-  public ImageResource gear();
-
-  @Source("info.png")
-  public ImageResource info();
-
-  @Source("warning.png")
-  public ImageResource warning();
-
-  @Source("listAdd.png")
-  public ImageResource listAdd();
-
-  @Source("merge.png")
-  public ImageResource merge();
 }
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminResources.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminResources.java
index cd366f35f6..f1ac27f496 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminResources.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/AdminResources.java
@@ -24,9 +24,6 @@ public interface AdminResources extends ClientBundle {
   @Source("admin.css")
   AdminCss css();
 
-  @Source("editText.png")
-  public ImageResource editText();
-
   @Source("deleteNormal.png")
   public ImageResource deleteNormal();
 
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ValueEditor.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ValueEditor.ui.xml
index 9862848064..e5f66499df 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ValueEditor.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/admin/ValueEditor.ui.xml
@@ -18,7 +18,7 @@ limitations under the License.
   xmlns:ui='urn:ui:com.google.gwt.uibinder'
   xmlns:g='urn:import:com.google.gwt.user.client.ui'
   >
-<ui:with field='res' type='com.google.gerrit.client.admin.AdminResources'/>
+<ui:with field='ico' type='com.google.gerrit.client.GerritResources'/>
 <ui:style>
   .panel {
     position: relative;
@@ -49,7 +49,7 @@ limitations under the License.
 <g:HTMLPanel stylePrimaryName='{style.panel}'>
   <g:Image
       ui:field='editIcon'
-      resource='{res.editText}'
+      resource='{ico.edit}'
       stylePrimaryName='{style.editIcon}'
       title='Edit'>
     <ui:attribute name='title'/>
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/arrowRight.gif b/gerrit-gwtui/src/main/java/com/google/gerrit/client/arrowRight.gif
deleted file mode 100644
index d9e63a57544588bad6612e90ef2abeb5689aa959..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 78
zcmZ?wbhEHb<YC}sSj58c_wV1YU%&qR`I7+^DE?$&WME)n&;bd9)G{y&dw6Ysx7=3Z
TdDqoPf3~IG5$OtJVz34Pe2*6%

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.ui.xml
index a645cada57..c51587acb2 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/CommitBox.ui.xml
@@ -20,7 +20,7 @@ limitations under the License.
     xmlns:x='urn:import:com.google.gerrit.client.ui'
     xmlns:clippy='urn:import:com.google.gwtexpui.clippy.client'>
   <ui:with field='ico' type='com.google.gerrit.client.GerritResources'/>
-  <ui:image field="toggle" src="more_less.png"/>
+  <ui:image field="toggle" src="moreLess.png"/>
   <ui:style type='com.google.gerrit.client.change.CommitBox.Style'>
     @eval trimColor com.google.gerrit.client.Gerrit.getTheme().trimColor;
 
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java
index 1e6192a747..117ebe1783 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Hashtags.java
@@ -171,7 +171,7 @@ public class Hashtags extends Composite {
           .setAttribute("title", "Remove hashtag")
           .setAttribute("onclick", REMOVE + "(event)")
           .append(
-              new ImageResourceRenderer().render(Resources.I.remove_reviewer()))
+              new ImageResourceRenderer().render(Gerrit.RESOURCES.removeReviewer()))
           .closeElement("button")
           .closeSpan();
       if (itr.hasNext()) {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Labels.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Labels.java
index 9c4b8e1e28..47bf8054af 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Labels.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Labels.java
@@ -274,7 +274,7 @@ class Labels extends Grid {
         html.openElement("button")
             .setAttribute("title", Util.M.removeReviewer(name))
             .setAttribute("onclick", REMOVE + "(event)")
-            .append(new ImageResourceRenderer().render(Resources.I.remove_reviewer()))
+            .append(new ImageResourceRenderer().render(Gerrit.RESOURCES.removeReviewer()))
             .closeElement("button");
       }
       html.closeSpan();
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Resources.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Resources.java
index 7ca3c5315e..4fc76c18ab 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Resources.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/Resources.java
@@ -17,16 +17,12 @@ package com.google.gerrit.client.change;
 import com.google.gwt.core.client.GWT;
 import com.google.gwt.resources.client.ClientBundle;
 import com.google.gwt.resources.client.CssResource;
-import com.google.gwt.resources.client.ImageResource;
 
 public interface Resources extends ClientBundle {
   public static final Resources I = GWT.create(Resources.class);
   static final ChangeConstants C = GWT.create(ChangeConstants.class);
   static final ChangeMessages M = GWT.create(ChangeMessages.class);
 
-  @Source("star_open.png") ImageResource star_open();
-  @Source("star_filled.png") ImageResource star_filled();
-  @Source("remove_reviewer.png") ImageResource remove_reviewer();
   @Source("common.css") Style style();
 
   public interface Style extends CssResource {
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/StarIcon.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/StarIcon.java
index fccca27058..0f19406d0c 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/StarIcon.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/StarIcon.java
@@ -14,13 +14,14 @@
 
 package com.google.gerrit.client.change;
 
+import com.google.gerrit.client.Gerrit;
 import com.google.gwt.user.client.ui.Image;
 import com.google.gwt.user.client.ui.ToggleButton;
 
 class StarIcon extends ToggleButton {
   StarIcon() {
     super(
-      new Image(Resources.I.star_open()),
-      new Image(Resources.I.star_filled()));
+      new Image(Gerrit.RESOURCES.starOpen()),
+      new Image(Gerrit.RESOURCES.starFilled()));
   }
 }
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/more_less.png b/gerrit-gwtui/src/main/java/com/google/gerrit/client/change/moreLess.png
similarity index 100%
rename from gerrit-gwtui/src/main/java/com/google/gerrit/client/change/more_less.png
rename to gerrit-gwtui/src/main/java/com/google/gerrit/client/change/moreLess.png
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentBoxUi.css b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentBoxUi.css
index da0754b528..441af22cc1 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentBoxUi.css
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/CommentBoxUi.css
@@ -123,15 +123,15 @@
   color: #fff;
 }
 
-@sprite .go_prev {
-  gwt-image: "go_prev";
+@sprite .goPrev {
+  gwt-image: "goPrev";
   display: inline-block;
 }
-@sprite .go_next {
-  gwt-image: "go_next";
+@sprite .goNext {
+  gwt-image: "goNext";
   display: inline-block;
 }
-@sprite .go_up {
-  gwt-image: "go_up";
+@sprite .goUp {
+  gwt-image: "goUp";
   display: inline-block;
 }
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.ui.xml b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.ui.xml
index 7d1f1e5eb5..08b64db727 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.ui.xml
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Header.ui.xml
@@ -18,6 +18,7 @@ limitations under the License.
     xmlns:ui='urn:ui:com.google.gwt.uibinder'
     xmlns:g='urn:import:com.google.gwt.user.client.ui'
     xmlns:x='urn:import:com.google.gerrit.client.ui'>
+  <ui:with field='ico' type='com.google.gerrit.client.GerritResources'/>
   <ui:with field='res' type='com.google.gerrit.client.diff.Resources'/>
   <ui:style>
   .header {
@@ -60,16 +61,16 @@ limitations under the License.
     <span class='{style.path}'><span ui:field='project'/> / <span ui:field='filePath'/></span>
     <div class='{style.navigation}'>
       <span ui:field='noDiff' class='{style.nodiff}'><ui:msg>No Differences</ui:msg></span>
-      <x:InlineHyperlink ui:field='prev' styleName='{res.style.go_prev}'/>
+      <x:InlineHyperlink ui:field='prev' styleName='{res.style.goPrev}'/>
       <x:InlineHyperlink ui:field='up'
-          styleName='{res.style.go_up}'
+          styleName='{res.style.goUp}'
           title='Up to change (Shortcut: u)'>
         <ui:attribute name='title'/>
       </x:InlineHyperlink>
-      <x:InlineHyperlink ui:field='next' styleName='{res.style.go_next}'/>
+      <x:InlineHyperlink ui:field='next' styleName='{res.style.goNext}'/>
       <g:Image ui:field='preferences'
            styleName='{style.preferences}'
-           resource='{res.gear}'
+           resource='{ico.gear}'
            title='Diff preferences (Shortcut: ,)'>
          <ui:attribute name='title'/>
       </g:Image>
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Resources.java b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Resources.java
index 8c4fc516b6..605935bb48 100644
--- a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Resources.java
+++ b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/Resources.java
@@ -24,10 +24,9 @@ interface Resources extends ClientBundle {
   static final Resources I = GWT.create(Resources.class);
 
   @Source("CommentBoxUi.css") Style style();
-  @Source("go-prev.png") ImageResource go_prev();
-  @Source("go-next.png") ImageResource go_next();
-  @Source("go-up.png") ImageResource go_up();
-  @Source("gear.png") ImageResource gear();
+  @Source("goPrev.png") ImageResource goPrev();
+  @Source("goNext.png") ImageResource goNext();
+  @Source("goUp.png") ImageResource goUp();
 
   interface Style extends CssResource {
     String commentWidgets();
@@ -38,8 +37,8 @@ interface Resources extends ClientBundle {
     String summary();
     String date();
 
-    String go_prev();
-    String go_next();
-    String go_up();
+    String goPrev();
+    String goNext();
+    String goUp();
   }
 }
diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/goNext.png b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/goNext.png
new file mode 100644
index 0000000000000000000000000000000000000000..872c1979e0a29633719a5793a4b30fc28175c92c
GIT binary patch
literal 623
zcmV-#0+9WQP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0003>P)t-s|Ns9w
za|Akb1UhpBJ9Pv)bObwf1X+wKI&=i2#)La|1UhsCJ9Gp?dJuuDS~_$EUym`I!+J)1
z6kd-of~#6qi6)D?T|#;eai%^yb_6_l1XGJ1Jaz<&!B{|f3OaNIYN0kfb_7j?7&~?Z
zI&%ca-ms&}eomSOjlo=v!di;LRgA+}uhfjo;I^5>Z@Jf;bgw&ZtTSk-D{HJTc(y%)
zzDbG0P>94$gu+RHzC@eKZK}?RvC@&f*`v$hx3|=sQlJM{rwNF=SWlb=RHO)6tP5VV
z4Pv<tWV{b-zZ{&>XN$aBz}u&!%zmfQf2!4iVYd!uzYu@RG^pBm!rZFG-L1ynudCL9
zWV#WO(^93^bBn!Pk-=oE*MXqbY>d8Kg}GF0x*u=4CXL2bp2>Dwt_zRBVV%fxyV;+n
z(|gY2yTjb8U$PEnxEI@!DY5_n03>u$PE!D7Eeyrzo%XB#_u;Jd`r-Ee_4fJo{`L9c
z_w}s)^=0_s^{aGu7@YtB0I*3!K~#8NWsg;_gJ2W{fx5ffl@F-9ySuyVb@~6V1zOUQ
z?&IWab`C^^4MWTT9-qYoS+xjZfS+H1<XYnZB0`Thos)~H8fcFvQxsi)e11t~2njO#
zVr#XtJDe`JLJ1SV=MMx!;Yc(VPb5<+E(9<f$Mc2vzyHJW^rpFhQn^yC)f-K%j;vr9
z*6H^8gW*VTK<HWHY`$2U%r{%G*;=f&d(-cyXQukgD}Da({uy9e8<Wv|VkZCq002ov
JPDHLkV1o5zCQSeU

literal 0
HcmV?d00001

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/goPrev.png b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/goPrev.png
new file mode 100644
index 0000000000000000000000000000000000000000..d68f29b34c5444cee0484936c469bdc0bd17aff4
GIT binary patch
literal 609
zcmV-n0-pVeP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D0003#P)t-s|Ns9w
za|Akb1UhpBI&%a&bp$$e1Uq#EJ9Y#+bObtd1Uq&Ff2meOdJsBv1%0ShS&Jz}d=r<w
za-hS0SBWQGjV@Y@EJ1k=hqhZgbp&prJyMAtJ$VE_c?ylhSv+<GYoazygc&+>1W}#`
zh`U(D-mas{eomSOiM&~`-h;&5tiRf(#@?=xz+|P#f{?#saIH0UvOIgXLVvkOdbdJx
zur+0<C#TJXoy2#CyHsYZB4)23Vy_omtqxhN3s|WNfVNGu(w2R-NrJaemda&iwHaWw
z4PmzqVYUulvkh9U3s$BHwbYlC!fK_}c6`V)X~Gd_!4a<8f~?qqsnmeT-?6>fqov$#
z%HXxa+^VV9eTuwVg}GFRx>uvsa+lgvZpjs@&xnh?TwbFcRip`Eq#$UiE4bF1$KSE0
z&ws+hnlk_Z03vi!PE!CaWejA+=$)*r;rIFV;rjOW{{Hp$_4fYZ`Sthp{^9ub3e8$#
z00026Nkl<ZcwSYHRgS|z5Jbmzm>HIL%nma%Gczym{Vx#5k)p}_e5z7)gBvnAKq1s7
zhzd-jo1p^NTjxuN#O<Y%?@tRw6qmTc*zN5;1lmgrD=5azmPD~!*;3qwqdX8O9sWQt
z6pln=@z3v{Us2eSsdOfr%NM>#mSrv#r>k14H=3<>hm-`s+z<W1a5SDw{~1XDLiM;m
v9Qmi~tOWl2vf%Gee|=jcLaMzZ0)77sl6@K^fpR&K00000NkvXXu0mjf7i<^e

literal 0
HcmV?d00001

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/goUp.png b/gerrit-gwtui/src/main/java/com/google/gerrit/client/diff/goUp.png
new file mode 100644
index 0000000000000000000000000000000000000000..f75bed4478f335de951cce80d3631345409e5b11
GIT binary patch
literal 637
zcmV-@0)qXCP)<h;3K|Lk000e1NJLTq000mG000mO0{{R3C@l|D00042P)t-s|Ns9w
za|Akb1UhpBI&=g(bp$(g1UqyDR*5D-c@I~KD2B6Jc%@F3y>e=tJ3)C4PlO#ncnv;x
z3ZcY+gtS#Vbp(H@R%e_wJ9PwDizrNl7&>$WSBfY+cmzIr1v+#DJ9Gp(a|Eo}f`+_N
zmBMPZ)t8pVX_3WXi^EoCupL>f3t6iRg~3gBu|KEEhoH%NyVszMy<f`Uwb13f&gHnv
z<+GQ~V`#b=WV{b$z7Vh6gRa|xeY8lX(|drnO?tCLT%sD9#Bs~!vWdw{WxWt-!x3x8
z60+fhn#FR;<*<0eF=xOLY{(OF&lR-gg~;TsZM`36zYuE05^c#7v*U!t;;D<iTDR1k
zmday+!9!lN4PUhlU$hNhvJaciYEz>KY_BYr!)~zBk#w{;qQ`#6->_x27Gt^(X1)+-
z!4a_DgTddWs?~w3*MY6tg00ztpv!lf%51Y5h28)F03mczPE!D7EezqE#jN%A_5S+)
z`S$hp_Wu6i`S`2$^{e*x_vq*uqv&n`006Z~L_t(|UR91$x5Hon1jEuczSOpDTi3Sl
z|5uYVCrS5dcOK>}#01BolfV)Y%-@JO_M}9(jbieFM~a~=5Xv4ZQIEpP3T%mFt=?#=
z7!9J{$9L|>+q-)WaujI2K7Sw>3P*H$loA-8|NhU;FD|dHZ;U2VU{0ko*<8L*ER~6>
z1%?Cw0DG(5>Gt{#vI=M|7>>r1=?t(xz<jY>tv5WdeR+L*|KNeouW#b#mjg~f$3^u6
XwJjVG*#u0(00000NkvXXu0mjf(E2Vo

literal 0
HcmV?d00001

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/editText.png b/gerrit-gwtui/src/main/java/com/google/gerrit/client/editText.png
deleted file mode 100644
index 2927275f56cc3139f985e835ee442846c774e03d..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 409
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbMf#sHrXS0H_40gzzm=xXhcWCD^4
zn?r#Npa_rzO1*mZ>h<f_n>K9%N-b#*fAi+e>C>lQzI^%a)v?Q$FW<g>`~B<VKVKZ%
zzJ2?dGiP?}*ztO!?YU(c|NsBrvuDrSr$<iAPbn-cJioTEw6wG!+VarquEnjP=T~L6
zwY9x{cGSm7Ej!$7?%cW8u3cNVZrzb1M}YPwCnxvx^qe|%>ej7W{r&xy)?_Vc4tw|R
z-Nua@7qo=;A3qxgRK!^l<QL4~!noKt?N1C-ble(lpkSY;i(^PdTyD=*F(yYIXLhmE
zH?)8n|NL(^+%o53>l4lG-$VX*`u)13cWReDqxS864mTNft2ep2S~W4>?U=l<Oj~e;
znSJIC*+ma}d0zf`XC_$^UlzAP>A$JTuVw*f_8T3?C%@#m-dZ}lhh?>?+3mTaf0XaZ
z7ud|zKNfc5f|qL4%M%+u8q8UqC~za5N%5ZYH~zq{foa`9moa#{`njxgN@xNAE!e~!

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/gear.png b/gerrit-gwtui/src/main/java/com/google/gerrit/client/gear.png
deleted file mode 100644
index 2f84e4734f91dae0e7828343afdd92d40993fae1..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 246
zcmeAS@N?(olHy`uVBq!ia0vp^0wB!63?wyl`GbL!Wq?nJD~JxQaI4w{Bz@}l+9&sW
z*6ec1o)gxz-8p}$Yt_EFJ8tbc`?ziSrLeZcDHD#@EIi+|^kV<ItI2-v#DJQ)N`m}?
z86v(!{+Rx5-Pr?guQQYYMUy;T978JNdi!tl9Wvl?o?Y^|XwH__|NkT8wl%S=I#SvF
z)WR>4p@xlFdBb)$mDssG!HT65&WQ5n{}U*CR{C@6JMmHrr6pnBxj_c9x7XgQwdxW~
p&i*IztvL1K;u`b0`~RHgK6{(x^TmaZ>_FQXJYD@<);T3K0RR^~V~GF&

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/starFilled.gif b/gerrit-gwtui/src/main/java/com/google/gerrit/client/starFilled.gif
deleted file mode 100644
index 77619f0dc34e39275b1abfd9d987dda5f1c85013..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 171
zcmV;c095}+Nk%w1VGjTg0J8u9XlUV=m+Sua4_jAI_wX{Ur)1O2VK6Yu8X1>dS)GxK
zGt<frn3RyXxbx-P1poj4A^8LW000jFEC2ui01p5U000D7@X1N54JTN8*x6K*2uTA<
z03#@X1sw2U2upml&ruLOAqYJMLJ~kIen^2ssF5@dgQR0{FjWq|-vVK!1V#(RVv3^x
Z3X1_^5dK`%Ex>wMc{LxH^2rhb06U(FK#%|c

diff --git a/gerrit-gwtui/src/main/java/com/google/gerrit/client/starOpen.gif b/gerrit-gwtui/src/main/java/com/google/gerrit/client/starOpen.gif
deleted file mode 100644
index e8dc0a3aa2e6a1abfefea1da49f0b114bc1abd54..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 179
zcmV;k08IZ!Nk%w1VGjTg0J9GO|NsBY<NNCS|GV4%vDW_6?f=r``mEFbw%Go`;s3<m
z{NC#L-17gq*!|e&`Tzg_A^8LW000jFEC2ui01p5U000DF@W~mDnmCg}vNs7(1Rgdp
zfPj2KdjRm!2F5cWNglvro(zpcfkz}V4u(z9NT@9kgC!tASYR4MqTt{`2$mhpg22lH
h1~tkKfFKaQi~&ZGIFby)LIdMKARH454NVde06Vh-QO5uP