Added both System Tray and Top Corner Icons. Just used the actual pngs so that we don't use a new library or write a ton of code just for that. Removed 'org.apache.commons:commons-lang3:3.1' since the only spots it was used were in deprecated ways according to its documentation.

build.gradle

@@ -50,7 +50,6 @@ buildscript {
         'net.sourceforge.nekohtml:nekohtml:1.9.18',
         'javax.help:javahelp:2.0.05',
         'edu.sc.seis.gradle:macappbundle:2.0.0'
-
     }
 }
 
@@ -65,7 +64,6 @@ dependencies {
     compile \
     'javax.help:javahelp:2.0.05',
     'com.connectina.swing:fontchooser:1.0',
-    'org.apache.commons:commons-lang3:3.1',
     'net.sourceforge.collections:collections-generic:4.01',
     'org.apache.xmlgraphics:batik-svggen:1.7',
     'org.apache.xmlgraphics:batik-swing:1.7', 

src/main/java/com/cburch/logisim/gui/main/Frame.java

@@ -3,6 +3,8 @@
 
 package com.cburch.logisim.gui.main;
 
+import static com.cburch.logisim.util.LocaleString.getFromLocale;
+
 import java.awt.BorderLayout;
 import java.awt.Color;
 import java.awt.Container;
@@ -11,19 +13,28 @@ import java.awt.GraphicsConfiguration;
 import java.awt.GraphicsDevice;
 import java.awt.GraphicsEnvironment;
 import java.awt.IllegalComponentStateException;
+import java.awt.Image;
 import java.awt.Point;
 import java.awt.Rectangle;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 import java.beans.PropertyChangeEvent;
 import java.beans.PropertyChangeListener;
+import java.io.IOException;
+import java.io.InputStream;
+import java.util.ArrayList;
 
+import javax.imageio.ImageIO;
+import javax.imageio.stream.ImageInputStream;
 import javax.swing.JOptionPane;
 import javax.swing.JPanel;
 import javax.swing.WindowConstants;
 import javax.swing.event.ChangeEvent;
 import javax.swing.event.ChangeListener;
 
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+
 import com.cburch.draw.toolbar.Toolbar;
 import com.cburch.draw.toolbar.ToolbarModel;
 import com.cburch.logisim.circuit.Circuit;
@@ -57,7 +68,6 @@ import com.cburch.logisim.util.JFileChoosers;
 import com.cburch.logisim.util.LocaleListener;
 import com.cburch.logisim.util.LocaleManager;
 import com.cburch.logisim.util.VerticalSplitPane;
-import static com.cburch.logisim.util.LocaleString.*;
 
 @SuppressWarnings("serial")
 public class Frame extends LFrame implements LocaleListener {
@@ -184,6 +194,8 @@ public class Frame extends LFrame implements LocaleListener {
     private ZoomModel       layoutZoomModel;
     private LayoutEditHandler layoutEditHandler;
     private AttrTableSelectionModel attrTableSelectionModel;
+    
+    public static final Logger logger = LoggerFactory.getLogger( Frame.class );
 
     // for the Appearance view
     private AppearanceView appearance;
@@ -193,6 +205,14 @@ public class Frame extends LFrame implements LocaleListener {
 
         setBackground(Color.white);
         setDefaultCloseOperation(WindowConstants.DO_NOTHING_ON_CLOSE);
+        try {
+        	ArrayList<Image> icons = new ArrayList<Image>();
+        	icons.add(ImageIO.read(Frame.class.getResourceAsStream("/logisim/logisim 32.png")));
+        	icons.add(ImageIO.read(Frame.class.getResourceAsStream("/logisim/logisim 16.png")));
+			setIconImages(icons);
+		} catch (IOException e) {
+			logger.error(e.getMessage());
+		}
         addWindowListener(new MyWindowListener());
 
         proj.addProjectListener(myProjectListener);

src/main/java/com/cburch/logisim/std/memory/Ram.java

@@ -3,12 +3,12 @@
 
 package com.cburch.logisim.std.memory;
 
+import static com.cburch.logisim.util.LocaleString.getFromLocale;
+
 import java.awt.Color;
 import java.awt.event.WindowAdapter;
 import java.awt.event.WindowEvent;
 
-import org.apache.commons.lang3.ObjectUtils;
-
 import com.cburch.logisim.circuit.CircuitState;
 import com.cburch.logisim.data.Attribute;
 import com.cburch.logisim.data.AttributeEvent;
@@ -30,7 +30,6 @@ import com.cburch.logisim.instance.InstanceState;
 import com.cburch.logisim.instance.Port;
 import com.cburch.logisim.instance.StdAttr;
 import com.cburch.logisim.proj.Project;
-import static com.cburch.logisim.util.LocaleString.*;
 
 public class Ram extends Mem {
     static final AttributeOption BUS_COMBINED
@@ -84,8 +83,8 @@ public class Ram extends Mem {
             bus = BUS_COMBINED;
         }
 
-        boolean asynch = ObjectUtils.equals(bus, BUS_ASYNCH);
-        boolean separate = ObjectUtils.equals(bus, BUS_SEPARATE);
+        boolean asynch = bus.equals(BUS_ASYNCH);
+        boolean separate = bus.equals(BUS_SEPARATE);
 
         int portCount = MEM_INPUTS;
         if (asynch) {
@@ -171,8 +170,8 @@ public class Ram extends Mem {
         RamState myState = (RamState) getState(state);
         BitWidth dataBits = state.getAttributeValue(DATA_ATTR);
         Object busVal = state.getAttributeValue(ATTR_BUS);
-        boolean asynch = ObjectUtils.equals(busVal, BUS_ASYNCH);
-        boolean separate = ObjectUtils.equals(busVal, BUS_SEPARATE);
+        boolean asynch = busVal.equals(BUS_ASYNCH);
+        boolean separate = busVal.equals(BUS_SEPARATE);
 
         Value addrValue = state.getPort(ADDR);
         boolean chipSelect = state.getPort(CS) != Value.FALSE;
@@ -223,8 +222,8 @@ public class Ram extends Mem {
     public void paintInstance(InstancePainter painter) {
         super.paintInstance(painter);
         Object busVal = painter.getAttributeValue(ATTR_BUS);
-        boolean asynch = ObjectUtils.equals(busVal, BUS_ASYNCH);
-        boolean separate = ObjectUtils.equals(busVal, BUS_SEPARATE);
+        boolean asynch = busVal.equals(BUS_ASYNCH);
+        boolean separate = busVal.equals(BUS_SEPARATE);
 
         if (!asynch) {
             painter.drawClock(CLK, Direction.NORTH);