diff --git a/src/MacVim/Info.plist b/src/MacVim/Info.plist
index 30afe4992c..5587bba703 100644
--- a/src/MacVim/Info.plist
+++ b/src/MacVim/Info.plist
@@ -8,7 +8,6 @@
 	<!-- When adding support for a new file type:
 	     1. Add entry to CFBundleDocumentTypes
 	     2. Add entry to UTExportedTypeDeclarations below (for Quick Look)
-	     3. Add entry to icons/make_icons.py script (for document icon)
 
 	     For a list of UTIs, see
 	     http://developer.apple.com/documentation/Carbon/Conceptual/
diff --git a/src/MacVim/README b/src/MacVim/README
index 1a15597cfb..7c2018934f 100644
--- a/src/MacVim/README
+++ b/src/MacVim/README
@@ -162,18 +162,11 @@ be in when executing these commands):
 1. Configure Vim (call "./configure --help" to see a list of flags)
     src/$ ./configure
 
-2. Generate document icons (OPTIONAL)
-    src/MacVim/icons$ make getenvy
-    src/MacVim/icons$ make all
-
-3. Build
+2. Build
     src/$ make
 
 The application bundle can be found inside "src/MacVim/build/Release".
 
-If step 2 is skipped a generic document icon will be used for all file types.
-It is also possible to download the document icons if this step fails.
-
 
 Bjorn Winckler <bjorn.winckler@gmail.com>
 March 21, 2011
diff --git a/src/MacVim/icons/Makefile b/src/MacVim/icons/Makefile
index 97fa408ac2..1eac40c762 100644
--- a/src/MacVim/icons/Makefile
+++ b/src/MacVim/icons/Makefile
@@ -2,44 +2,7 @@
 
 OUTDIR ?= .
 
-# This script is called during the build phase with OUTDIR set to the Resources
-# folder of the app bundle.  The default action is to simply copy all files
-# named MacVim-*.icns to OUTDIR.
-#
-# The files in version control are all links to the MacVim-generic.icns file.
-# In order to get prettier document icons, call "make all" in this folder
-# before building.  This will call the document generation program which
-# overwrites the MacVim-*.icns links with actual icons (see make_icons.py).
-#
-# The Envy Code R font can be used to render small icons that are more legible.
-# In order to use ECR, call "make getenvy" before calling "make all".  This
-# step requires an internet connection.
-
 $(OUTDIR)/MacVim-generic.icns:
 	cp -pR MacVim-*.icns "$(OUTDIR)"/
 
-all: make_icons.py vim-noshadow-512.png loadfont.so
-	rm -f MacVim-*.icns
-	$(MAKE) -C makeicns
-	/usr/bin/python make_icons.py "$(OUTDIR)"
-
-loadfont.so: loadfont.c
-	/usr/bin/python setup.py install --install-lib .
-
-getenvy: Envy\ Code\ R\ Bold.ttf
-
-Envy\ Code\ R\ Bold.ttf: EnvyCodeR.zip
-	unzip -jo EnvyCodeR.zip
-	# unzip uses the file date from the zip file. Change the file date to
-	# "now", so that the zip is not unzipped in every `make` run.`
-	touch Envy\ Code\ R\ Bold.ttf
-
-ENVYCODE_URL=http://download.damieng.com/fonts/original/EnvyCodeR-PR7.zip
-EnvyCodeR.zip:
-	curl ${ENVYCODE_URL} --location -o EnvyCodeR.zip
-
-clean:
-	$(MAKE) -C makeicns clean
-	rm -f "$(OUTDIR)"/MacVim-*.icns loadfont.so *.pyc \
-	  EnvyCodeR.zip *.ttf *.reg *.txt
-	rm -rf *.egginfo build  # Created by setup.py
+all:
diff --git a/src/MacVim/icons/docerator.py b/src/MacVim/icons/docerator.py
deleted file mode 100644
index 34381dc2b1..0000000000
--- a/src/MacVim/icons/docerator.py
+++ /dev/null
@@ -1,616 +0,0 @@
-from Foundation import *
-from AppKit import *
-
-import itertools
-import math
-import operator
-import os
-
-from optparse import OptionParser
-
-
-# Resources
-DEFAULT_BACKGROUND = '/System/Library/CoreServices/CoreTypes.bundle/' + \
-    'Contents/Resources/GenericDocumentIcon.icns'  # might require leopard?
-
-
-# Cache both images and background renderers globally
-imageCache = {}
-bgCache = {}
-
-
-# Make us not crash
-# http://www.cocoabuilder.com/archive/message/cocoa/2008/8/6/214964
-NSApplicationLoad()
-
-
-class Surface(object):
-  """Represents a simple bitmapped image."""
-
-  def __init__(self, *p, **kw):
-    if not 'premultiplyAlpha' in kw:
-      kw['premultiplyAlpha'] = True
-    if len(p) == 1 and isinstance(p[0], NSBitmapImageRep):
-      self.bitmapRep = p[0]
-    elif len(p) == 2 and isinstance(p[0], int) and isinstance(p[1], int):
-      format = NSAlphaFirstBitmapFormat
-      if not kw['premultiplyAlpha']:
-        format += NSAlphaNonpremultipliedBitmapFormat
-      self.bitmapRep = NSBitmapImageRep.alloc().initWithBitmapDataPlanes_pixelsWide_pixelsHigh_bitsPerSample_samplesPerPixel_hasAlpha_isPlanar_colorSpaceName_bitmapFormat_bytesPerRow_bitsPerPixel_(
-          None, p[0], p[1], 8, 4, True, False, NSDeviceRGBColorSpace,
-          format, 0, 0)
-
-    if not hasattr(self, 'bitmapRep') or not self.bitmapRep:
-      raise Exception('Failed to create surface: ' + str(p))
-
-  def size(self):
-    return map(int, self.bitmapRep.size())  # cocoa returns floats. cocoa ftw
-
-  def data(self):
-    """Returns data in ARGB order (on intel, at least)."""
-    r = self.bitmapRep
-    if (r.bitmapFormat() & ~NSAlphaFirstBitmapFormat !=
-            NSAlphaNonpremultipliedBitmapFormat) or \
-        r.bitsPerPixel() != 32 or \
-        r.isPlanar() or \
-        r.samplesPerPixel() != 4:
-      raise Exception("Unsupported image format")
-    return self.bitmapRep.bitmapData()
-
-  def rgbaIndices(self):
-    r = self.bitmapRep
-    if r.bitmapFormat() & NSAlphaFirstBitmapFormat != 0:
-      return 1, 2, 3, 0
-    else:
-      return 0, 1, 2, 3
-
-  def save(self, filename):
-    """Saves image as png file."""
-    self.bitmapRep.representationUsingType_properties_(NSPNGFileType, None) \
-        .writeToFile_atomically_(filename, True)
-
-  def draw(self):
-    self.bitmapRep.draw()
-
-  def context(self):
-    # Note: Cocoa only supports contexts with premultiplied alpha
-    return NSGraphicsContext.graphicsContextWithBitmapImageRep_(self.bitmapRep)
-
-  def copy(self):
-    return Surface(self.bitmapRep.copy())
-
-
-class Image(object):
-  """Represents an image that can consist of several Surfaces."""
-
-  def __init__(self, param):
-    if isinstance(param, str):
-      self.image = NSImage.alloc().initWithContentsOfFile_(param)
-    elif isinstance(param, Surface):
-      self.image = NSImage.alloc().initWithSize_( param.size() )
-      self.image.addRepresentation_(param.bitmapRep)
-
-    if not self.image:
-      raise Exception('Failed to load image: ' + str(param))
-
-  def surfaceOfSize(self, w, h):
-    """Returns an ARGB, non-premultiplied surface of size w*h or throws."""
-    r = None
-    for rep in self.image.representations():
-      # Cocoa reports fraction widths for pngs (wtf?!), so use round()
-      if map(lambda x: int(round(x)), rep.size()) == [w, h]:
-        r = rep
-        break
-
-    # XXX: Resample in this case? That'd make the program easier to use, but
-    #      can silently create blurry backgrounds. Since this happens with
-    #      the app icon anyways, this might not be a huge deal?
-    if not r:
-      raise Exception('Unsupported size %dx%d', w, h)
-    return Surface(r)
-
-  def blend(self):
-    self.compositeInRect( ((0, 0), self.image.size()) )
-
-  def compositeInRect(self, r, mode=NSCompositeSourceOver):
-    self.image.drawInRect_fromRect_operation_fraction_(r, NSZeroRect,
-        mode, 1.0)
-
-  def sizes(self):
-    s = set()
-    for rep in self.image.representations():
-      s.add(tuple(map(lambda x: int(round(x)), rep.size())))
-    return s
-
-
-class Context(object):
-  # Tiger has only Python2.3, so we can't use __enter__ / __exit__ for this :-(
-
-  def __init__(self, surface):
-    NSGraphicsContext.saveGraphicsState()
-    c = surface.context()
-    c.setShouldAntialias_(True);
-    c.setImageInterpolation_(NSImageInterpolationHigh);
-    NSGraphicsContext.setCurrentContext_(c)
-
-  def done(self):
-    NSGraphicsContext.restoreGraphicsState()
-
-
-class SplittableBackground(object):
-
-  def __init__(self, unsplitted, shouldSplit=True):
-    self.unsplitted = unsplitted
-    self.shouldSplit = shouldSplit
-    self.ground = {}
-    self.shadow = {}
-
-  def rawGroundAtSize(self, s):
-    return self.unsplitted.surfaceOfSize(s, s)
-
-  def groundAtSize(self, s):
-    if not self.shouldSplit:
-      return self.rawGroundAtSize(s)
-    self._performSplit(s)
-    return self.ground[s]
-
-  def shadowAtSize(self, s):
-    if not self.shouldSplit:
-      return None
-    self._performSplit(s)
-    return self.shadow[s]
-
-  def _performSplit(self, s):
-    if s in self.ground:
-      assert s in self.shadow
-      return
-    assert s not in self.shadow
-    ground, shadow = splitGenericDocumentIcon(self.unsplitted, s)
-    self.ground[s] = ground
-    self.shadow[s] = shadow
-
-
-class BackgroundRenderer(object):
-
-  def __init__(self, bg, icon=None, r={}):
-    self.bgRenderer = bg
-    self.icon = icon
-    self.cache = {}
-    self.rect = r
-
-  def drawIcon(self, s):
-    if not self.icon:
-      return
-
-    assert s in [16, 32, 128, 256, 512]
-    a = list(self.rect[s])
-
-    # convert from `flow` coords to cocoa
-    a[2] = -a[2]  # mirror y
-
-    w, h = s*a[1], s*a[3]
-    self.icon.compositeInRect( (((s-w)/2 + a[0], (s-h)/2 + a[2]), (w, h)) )
-
-  def drawAtSize(self, s):
-    if not self.icon:
-      # No need to split the background if no icons is interleaved -- take
-      # the faster code path in that case.
-      self.bgRenderer.rawGroundAtSize(s).draw()
-      return
-
-    self.bgRenderer.groundAtSize(s).draw()
-    self.drawIcon(s)
-    if self.bgRenderer.shouldSplit:
-      # shadow needs to be composited, so it needs to be in an image
-      Image(self.bgRenderer.shadowAtSize(s)).blend()
-
-  def backgroundAtSize(self, s):
-    if not s in self.cache:
-      result = Surface(s, s)
-      context = Context(result)
-      self.drawAtSize(s)
-      context.done()
-      self.cache[s] = result
-    return self.cache[s]
-
-
-def splitGenericDocumentIcon(img, s):
-  """Takes the generic document icon and splits it into a background and a
-  shadow layer. For the 32x32 and 16x16 variants, the white pixels of the page
-  curl are hardcoded into the otherwise transparent shadow layer."""
-
-  w, h = s, s
-  r = img.surfaceOfSize(w, h)
-  bps = 4*w
-  data = r.data()
-  dr, dg, db, da = r.rgbaIndices()
-
-  ground = Surface(w, h, premultiplyAlpha=False)
-  shadow = Surface(w, h, premultiplyAlpha=False)
-
-  grounddata = ground.data()
-  shadowdata = shadow.data()
-
-  for y in xrange(h):
-    for x in xrange(w):
-      idx = y*bps + 4*x
-      ia = data[idx + da]
-      ir = data[idx + dr]
-      ig = data[idx + dg]
-      ib = data[idx + db]
-      if ia != chr(255):
-        # buffer objects don't support slice assignment :-(
-        grounddata[idx] = ia
-        grounddata[idx + 1] = ir
-        grounddata[idx + 2] = ig
-        grounddata[idx + 3] = ib
-        shadowdata[idx] = chr(0)
-        shadowdata[idx + 1] = chr(0)
-        shadowdata[idx + 2] = chr(0)
-        shadowdata[idx + 3] = chr(0)
-        continue
-
-      assert ir == ig == ib
-      grounddata[idx] = chr(255)
-      grounddata[idx + 1] = chr(255)
-      grounddata[idx + 2] = chr(255)
-      grounddata[idx + 3] = chr(255)
-      shadowdata[idx] = chr(255 - ord(ir))
-      shadowdata[idx + 1] = chr(0)
-      shadowdata[idx + 2] = chr(0)
-      shadowdata[idx + 3] = chr(0)
-
-  # Special-case 16x16 and 32x32 cases: Make some pixels on the fold white.
-  # Ideally, I could make the fold whiteish in all variants, but I can't.
-  whitePix = { 16: [(10, 2), (10, 3), (11, 3), (10, 4), (11, 4), (12, 4)],
-               32: [(21, 4), (21, 5), (22, 5), (21, 6), (22, 6), (23, 6)]}
-  if (w, h) in [(16, 16), (32, 32)]:
-    for x, y in whitePix[w]:
-      idx = y*bps + 4*x
-      shadowdata[idx] = chr(255)
-      shadowdata[idx + 1] = chr(255)
-      shadowdata[idx + 2] = chr(255)
-      shadowdata[idx + 3] = chr(255)
-
-  return ground, shadow
-
-
-class TextRenderer(object):
-
-  def __init__(self):
-    self.cache = {}
-
-  def attribsAtSize(self, s):
-    if s not in self.cache:
-      self.cache[s] = self._attribsAtSize(s)
-    return self.cache[s]
-
-  def centeredStyle(self):
-    style = NSMutableParagraphStyle.new()
-    style.setParagraphStyle_(NSParagraphStyle.defaultParagraphStyle())
-    style.setAlignment_(NSCenterTextAlignment)
-    return style
-
-  def _attribsAtSize(self, s):
-    # This looks not exactly like the font on Preview.app's document icons,
-    # but I believe that's because Preview's icons are drawn by Photoshop,
-    # and Adobe's font rendering is different from Apple's.
-    fontname = 'LucidaGrande-Bold'
-
-    # Prepare text format
-    fontsizes = { 512: 72.0,  256: 36.0,  128: 18.0,  32: 7.0,  16: 3.0 }
-    # http://developer.apple.com/documentation/Cocoa/Conceptual/AttributedStrings/Articles/standardAttributes.html#//apple_ref/doc/uid/TP40004903
-    attribs = {
-      NSParagraphStyleAttributeName: self.centeredStyle(),
-      NSForegroundColorAttributeName: NSColor.colorWithDeviceWhite_alpha_(
-          0.34, 1),
-      NSFontAttributeName: NSFont.fontWithName_size_(fontname, fontsizes[s])
-    }
-
-    # tighten font a bit for some sizes
-    if s in [256, 512]:
-      attribs[NSKernAttributeName] = -1.0
-    elif s == 32:
-      attribs[NSKernAttributeName] = -0.25
-
-    if not attribs[NSFontAttributeName]:
-      raise Exception('Failed to load font %s' % fontname)
-    return attribs
-
-  def drawTextAtSize(self, text, s):
-    """Draws text `s` into the current context of size `s`."""
-
-    textRects = {
-        512: ((0, 7), (512, 119)),
-        128: ((0, 6), (128, 26.5)),
-        256: ((0, 7), (256, 57)),
-         16: ((1, 1), (15, 5)),
-         #32: ((1, 1), (31, 9))
-        }
-
-    attribs = self.attribsAtSize(s)
-    text = NSString.stringWithString_(text)
-    if s in [16, 128, 256, 512]:
-      text.drawInRect_withAttributes_(textRects[s], attribs)
-    elif s == 32:
-      # Try to align text on pixel boundary:
-      attribs = attribs.copy()
-      attribs[NSParagraphStyleAttributeName] = \
-          NSParagraphStyle.defaultParagraphStyle()
-      ts = text.sizeWithAttributes_(attribs)
-      text.drawAtPoint_withAttributes_( (math.floor((32.0-ts[0])/2) + 0.5, 1.5),
-          attribs)
-
-
-class OfficeTextRenderer(TextRenderer):
-  """Uses Office's LucidaSans font for 32x32.
-
-  This font looks much better for certain strings (e.g. "PDF") but much worse
-  for most others (e.g. "VIM", "JAVA") -- and office fonts are usually not
-  installed. Hence, this class is better not used.
-  """
-
-  def _attribsAtSize(self, s):
-    self.useOfficeFont = False
-    attribs = TextRenderer._attribsAtSize(self, s)
-    if s == 32:
-      font = NSFont.fontWithName_size_('LucidaSans-Demi', 7.0)
-      if font:
-        attribs[NSFontAttributeName] = font
-        attribs[NSKernAttributeName] = 0
-        self.useOfficeFont = True
-    return attribs
-
-  def drawTextAtSize(self, text, s):
-    attribs = self.attribsAtSize(s)
-    if not self.useOfficeFont or s != 32:
-      TextRenderer.drawTextAtSize(self, text, s)
-      return
-    text = NSString.stringWithString_(text)
-    text.drawInRect_withAttributes_( ((0, 1), (31, 11)), attribs)
-
-
-def createIcon(s, bg, textRenderer, text):
-
-  # Fill in background
-  output = bg.backgroundAtSize(s).copy()
-
-  # Draw text on top of shadow
-  context = Context(output)
-  if s in text and text[s]:
-    textRenderer.drawTextAtSize(text[s], s)
-  context.done()
-
-  return output
-
-
-def textDictFromTextList(l):
-  assert 1 <= len(l) <= 3
-  if len(l) == 1:
-    return dict.fromkeys([16, 32, 128, 256, 512], l[0])
-  elif len(l) == 2:
-    return dict(zip([16, 32], 2*[l[1]]) + zip((128, 256, 512), 3*[l[0]]))
-  elif len(l) == 3:
-    return dict([(16, l[2]), (32, l[1])] + zip((128, 256, 512), 3*[l[0]]))
-
-
-def saveIcns(icons, icnsName, makeIcns='./makeicns'):
-  """Creates an icns file with several variants.
-
-  Params:
-    icons: A dict that contains icon size as key and Surface as value.
-           Valid keys are 512, 256, 128, 32, 16
-    icnsname: Name of the output file
-  """
-  # If IconFamily was less buggy, we could wrap it into a python module and
-  # call it directly, which is about a lot faster. However, IconFamily does not
-  # work with NSAlphaNonpremultipliedBitmapFormat correctly, so this has to
-  # wait.
-  #import IconFamily
-  #typeDict = {
-      #16: IconFamily.kSmall32BitData,
-      #32: IconFamily.kLarge32BitData,
-      #128: IconFamily.kThumbnail32BitData,
-      #256: IconFamily.kIconServices256PixelDataARGB,
-      #512: IconFamily.IconServices512PixelDataARGB,
-  #}
-  #maskDict = {
-      #16: IconFamily.kSmall8BitMask,
-      #32: IconFamily.kLarge8BitMask,
-      #128: IconFamily.kThumbnail8BitMask,
-  #}
-  #output = IconFamily.IconFamily.iconFamily()
-  #for s, icon in icons.items():
-    #output.setIconFamilyElement_fromBitmapImageRep_(typeDict[s], icon.bitmapRep)
-    #if s in maskDict:
-      #output.setIconFamilyElement_fromBitmapImageRep_(
-          #maskDict[s], icon.bitmapRep)
-  #output.writeToFile_(icnsName)
-  TMPFILE = 'docerator_tmp_%d.png'
-  try:
-    args = []
-    for s, icon in icons.items():
-      assert s in [512, 256, 128, 32, 16]
-      assert icon.size() == [s, s]
-      icon.save(TMPFILE % s)
-      args.append('-%d %s' % (s, TMPFILE % s))
-    return \
-        os.system('%s %s -out %s' % (makeIcns, ' '.join(args), icnsName)) == 0
-  finally:
-    for s in icons:
-      if os.access(TMPFILE % s, os.F_OK):
-        os.remove(TMPFILE % s)
-
-
-def getOutname(options):
-  def saneBasename(p):
-    """ '/my/path/to/file.txt' -> 'file' """
-    return os.path.splitext(os.path.basename(p))[0]
-  textPart = 'Generic'
-  if options.text:
-    textPart = options.text.split(',')[0]
-  if options.appicon:
-    base = saneBasename(options.appicon)
-  else:
-    base = saneBasename(getBgName(options))
-  return '%s-%s.icns' % (base, textPart)
-
-
-def cachedImage(filename):
-  absPath = os.path.abspath(filename)
-  if not absPath in imageCache:
-    imageCache[absPath] = Image(absPath)
-  return imageCache[absPath]
-
-
-def cachedBackground(img, split):
-  key = (img, split)
-  if not key in bgCache:
-    bgCache[key] = SplittableBackground(img, shouldSplit=split)
-  return bgCache[key]
-
-
-# taken from running flow on preview
-defaultRects = {
-    16: (-0.30890000000000001, 0.4919, -1.2968, 0.4743),
-    32: (-0.27810000000000001,
-      0.58930000000000005,
-      -2.2292999999999998,
-      0.57140000000000002),
-    128: (1.1774, 0.56820000000000004, -0.8246, 0.56799999999999995),
-    256: (0.5917, 0.56489999999999996, -1.8994, 0.56499999999999995),
-    512: (0.68700000000000006,
-      0.56530000000000002,
-      -4.2813999999999997,
-      0.56540000000000001)
-    }
-
-
-def getBgName(options):
-  if not hasattr(options, 'background') \
-      or options.background in ['default-split', 'default-unsplit']:
-    return DEFAULT_BACKGROUND
-  else:
-    return options.background
-
-
-class IconGenerator(object):
-  def __init__(self, options):
-    if hasattr(options, 'textrenderer') and options.textrenderer:
-      self.textRenderer = options.textrenderer()
-    else:
-      self.textRenderer = TextRenderer()
-    
-    # Prepare input images
-    splitBackground = options.background == 'default-split'
-    self.bgIcon = cachedImage(getBgName(options))
-
-    self.testIcon = None
-    if options.appicon:
-      self.testIcon = cachedImage(options.appicon)
-
-    rects = defaultRects.copy()
-    rects[16] = [ 0.0000, 0.5000, -1.0000, 0.5000]  # manually, better
-    if hasattr(options, 'rects'):
-      rects.update(options.rects)
-
-    bg = cachedBackground(self.bgIcon, splitBackground)
-
-    if hasattr(options, 'backgroundrenderer') and options.backgroundrenderer:
-      self.bgRenderer = options.backgroundrenderer(bg, self.testIcon, rects)
-    else:
-      self.bgRenderer = BackgroundRenderer(bg, self.testIcon, rects)
-
-    self.testtext = textDictFromTextList(options.text.split(','))
-
-  def createIconAtSize(self, s):
-    return createIcon(s, self.bgRenderer, self.textRenderer, self.testtext)
-
-
-def iconGenerator(**kwargs):
-  return IconGenerator(optsFromDict(**kwargs))
-
-
-def makedocicon_opts(options):
-  renderer = IconGenerator(options)
-
-  if hasattr(options, 'sizes') and options.sizes:
-    if isinstance(options.sizes, list):
-      sizes = options.sizes
-    else:
-      sizes = map(int, options.sizes.split(','))
-  else:
-    sizes = renderer.bgIcon.sizes()
-    if renderer.testIcon:
-      sizes = sizes.intersection(renderer.testIcon.sizes())
-    sizes = sorted(map(operator.itemgetter(0), sizes))
-
-  icons = dict([(s, renderer.createIconAtSize(s)) for s in sizes])
-
-  if options.debug:
-    for s, icon in icons.iteritems():
-      icon.save(options.debug % s)
-
-  if hasattr(options, 'outname') and options.outname:
-    outname = options.outname
-  else:
-    outname = getOutname(options)
-  if saveIcns(icons, outname, options.makeicns):
-    print 'Wrote', outname
-  else:
-    print 'Failed to write %s. Make sure makeicns is in your path.' % outname
-
-
-def optsFromDict(**kwargs):
-  options, _ = getopts().parse_args([])  # get default options
-  for k in kwargs:
-    setattr(options, k, kwargs[k])
-  return options
-
-
-def makedocicon(**kwargs):
-  makedocicon_opts(optsFromDict(**kwargs))
-
-
-def makedocicons_opts(options):
-  if not hasattr(options, 'text') or not options.text:
-    options.text = ['']
-  texts = options.text
-  for text in texts:
-    options.text = text
-    makedocicon_opts(options)
-
-
-def makedocicons(**kwargs):
-  makedocicons_opts(optsFromDict(**kwargs))
-
-
-def getopts():
-  parser = OptionParser(usage='%prog [options]', version='%prog 1.01')
-  parser.add_option('--background', '--bg', default='default-split',
-      help='Used as background (special values: "default-split" (default), ' \
-          '"default-unsplit").')
-  parser.add_option('--appicon', help='App icon, defaults to no icon.')
-
-  parser.add_option('--text', help='Text on icon. Defaults to empty. '
-      'More than one text is supported, multiple docicons are generated in '
-      'that case.', action='append')
-  parser.add_option('--sizes', help='Sizes of icons. ' \
-      'Defaults to all sizes available in input appicon. Example: "512,128,16"')
-  # XXX(Nico): This has to go
-  parser.add_option('--debug', help='If set, write out pngs for all variants.' \
-      ' This needs to look like "debug%d.png".')
-  # XXX(Nico): This has to go once IconFamily is less buggy and can be used
-  # directly
-  parser.add_option('--makeicns', help='Path to makeicns binary',
-      default='./makeicns')
-  return parser
-
-
-def main():
-  options, args = getopts().parse_args()
-  makedocicons_opts(options)
-
-
-if __name__ == '__main__':
-  main()
diff --git a/src/MacVim/icons/docerator_test.py b/src/MacVim/icons/docerator_test.py
deleted file mode 100644
index f84eb32c56..0000000000
--- a/src/MacVim/icons/docerator_test.py
+++ /dev/null
@@ -1,65 +0,0 @@
-import docerator
-import unittest
-
-
-class TextDictFromTextListTest(unittest.TestCase):
-
-  def testBasic(self):
-
-    self.assertEquals({16: 'a', 32: 'a', 128: 'a', 256: 'a', 512: 'a'},
-        docerator.textDictFromTextList(['a']))
-    self.assertEquals({16: 'b', 32: 'b', 128: 'a', 256: 'a', 512: 'a'},
-        docerator.textDictFromTextList(['a', 'b']))
-    self.assertEquals({16: 'c', 32: 'b', 128: 'a', 256: 'a', 512: 'a'},
-        docerator.textDictFromTextList(['a', 'b', 'c']))
-
-
-class OutnameTest(unittest.TestCase):
-
-  class FakeOptions(object):
-    def __init__(self, **kwargs):
-      for k in kwargs:
-        self.__setattr__(k, kwargs[k])
-
-  def testBasic(self):
-    options = OutnameTest.FakeOptions(
-        appicon = '/Applications/iTunes.app/Contents/Resources/iTunes.icns',
-        text='MP3')
-    self.assertEquals('iTunes-MP3.icns', docerator.getOutname(options))
-
-  def testTextList(self):
-    options = OutnameTest.FakeOptions(
-        appicon = '/Applications/iTunes.app/Contents/Resources/iTunes.icns',
-        text='PYTHON,PY')
-    self.assertEquals('iTunes-PYTHON.icns',
-        docerator.getOutname(options))
-
-  def testEmptyText(self):
-    options = OutnameTest.FakeOptions(
-        appicon = '/Applications/iTunes.app/Contents/Resources/iTunes.icns',
-        text='')
-    self.assertEquals('iTunes-Generic.icns', docerator.getOutname(options))
-    options = OutnameTest.FakeOptions(
-        appicon = '/Applications/iTunes.app/Contents/Resources/iTunes.icns',
-        text=None)
-    self.assertEquals('iTunes-Generic.icns',
-        docerator.getOutname(options))
-
-  def testEmptyIcon(self):
-    options = OutnameTest.FakeOptions(appicon=None, text='MP3')
-    self.assertEquals('GenericDocumentIcon-MP3.icns',
-        docerator.getOutname(options))
-    options = OutnameTest.FakeOptions(appicon=None, text='')
-    self.assertEquals('GenericDocumentIcon-Generic.icns',
-        docerator.getOutname(options))
-    options = OutnameTest.FakeOptions(appicon=None, text='',
-        background='/Applications/Bla/bgicon.icns')
-    self.assertEquals('bgicon-Generic.icns',
-        docerator.getOutname(options))
-
-
-# XXX(Nico): Look at the doctest module.
-
-
-if __name__ == '__main__':
-  unittest.main()
diff --git a/src/MacVim/icons/loadfont.c b/src/MacVim/icons/loadfont.c
deleted file mode 100644
index d39170e120..0000000000
--- a/src/MacVim/icons/loadfont.c
+++ /dev/null
@@ -1,56 +0,0 @@
-// A small python module that registers a font with ATS, given the name of
-// the font.
-
-#include <Python/Python.h>
-#include <CoreFoundation/CoreFoundation.h>
-#include <Carbon/Carbon.h>
-
-static PyObject* loadfont(PyObject* self, PyObject* args) {
-  PyObject*   result = Py_False;
-  const char* path = NULL;
-  int         ok = PyArg_ParseTuple(args, "s", &path);
-
-  if (ok) {
-    CFStringRef componentPath = CFStringCreateWithCString(kCFAllocatorDefault,
-        path, kCFStringEncodingUTF8);
-    CFURLRef componentURL = CFURLCreateWithFileSystemPath(kCFAllocatorDefault,
-        componentPath, kCFURLPOSIXPathStyle, false);
-    FSRef fsref;
-
-    if (CFURLGetFSRef(componentURL, &fsref)) {
-      OSStatus err = noErr;
-      ATSFontContainerRef fontContainerRef;  // we don't deactivate the font
-#if (MAC_OS_X_VERSION_MAX_ALLOWED > MAC_OS_X_VERSION_10_4)
-      err = ATSFontActivateFromFileReference(&fsref,
-          kATSFontContextLocal, kATSFontFormatUnspecified, NULL,
-          kATSOptionFlagsDefault, &fontContainerRef);
-#else
-      FSSpec fsSpec;
-      FSRef  fsRef;
-      if ((err = FSGetCatalogInfo(
-              &fsRef, kFSCatInfoNone, NULL, NULL, &fsSpec, NULL)) == noErr) {
-        err = ATSFontActivateFromFileSpecification(&fsSpec,
-            kATSFontContextLocal, kATSFontFormatUnspecified, NULL,
-            kATSOptionFlagsDefault, &fontContainerRef);
-      }
-
-#endif
-
-      if (err == noErr) {
-        result = Py_True;
-      }
-    }
-    CFRelease(componentURL);
-    CFRelease(componentPath);       
-  }
-  return result;
-}
-
-static PyMethodDef LoadfontMethods[] = {
-  { "loadfont", loadfont, METH_VARARGS, "Locally activates font from file." },
-  { NULL, NULL, 0, NULL }
-};
-
-PyMODINIT_FUNC initloadfont(void) {
-  Py_InitModule("loadfont", LoadfontMethods);
-}
diff --git a/src/MacVim/icons/make_icons.py b/src/MacVim/icons/make_icons.py
deleted file mode 100644
index 49d6f6340f..0000000000
--- a/src/MacVim/icons/make_icons.py
+++ /dev/null
@@ -1,208 +0,0 @@
-# Creates all of MacVim document icons.
-
-import os
-import sys
-
-fontname = ''
-facename = None
-
-# http://www.macresearch.org/cocoa-scientists-part-xx-python-scriptersmeet-cocoa
-try:
-  # Make us independent of sysprefs->appearance->antialias fonts smaller than...
-  # Needs to happen before docerator is imported.
-  from AppKit import NSUserDefaults
-  prefs = NSUserDefaults.standardUserDefaults()
-  prefs.setInteger_forKey_(4, 'AppleAntiAliasingThreshold')
-
-  import docerator
-  import loadfont
-
-  from Foundation import NSString
-  from AppKit import *
-
-  dont_create = False
-except Exception, e:
-  print e
-  dont_create = True  # most likely because we're on tiger
-
-
-# icon types
-LARGE = 0  # 512, 128, 32, 16; about 96kB
-SMALL = 1  # 128, 32, 16; about 36kB
-LINK = 2  # Create link to generic icon; 4kB (== smallest block size on HFS+)
-
-iconsizes = {
-    SMALL: [128, 32, 16],
-    LARGE: [512, 128, 32, 16],
-}
-
-
-# Resources
-MAKEICNS = 'makeicns/makeicns'
-APPICON = 'vim-noshadow-512.png'
-DEFAULT_BACKGROUND = '/System/Library/CoreServices/CoreTypes.bundle/' + \
-    'Contents/Resources/GenericDocumentIcon.icns'
-
-
-# List of icons to create
-GENERIC_ICON_NAME = 'MacVim-generic'
-vimIcons = {
-    GENERIC_ICON_NAME: [u'', LARGE],
-    'MacVim-vim': [u'VIM', LARGE],
-    'MacVim-txt': [u'TXT', SMALL],
-    'MacVim-tex': [u'TEX', SMALL],
-    'MacVim-h': [u'H', SMALL],
-    'MacVim-c': [u'C', SMALL],
-    'MacVim-m': [u'M', SMALL],
-    'MacVim-mm': [u'MM', SMALL],
-    'MacVim-cpp': [u'C\uff0b\uff0b,C++,C++', SMALL],  # fullwidth plusses
-    'MacVim-java': [u'JAVA', SMALL],
-    'MacVim-f': [u'FTRAN', SMALL],
-    'MacVim-html': [u'HTML', SMALL],
-    'MacVim-xml': [u'XML', SMALL],
-    'MacVim-js': [u'JS', SMALL],
-    'MacVim-perl': [u'PERL,PL', SMALL],
-    'MacVim-py': [u'PYTHON,PY', SMALL],
-    'MacVim-php': [u'PHP', SMALL],
-    'MacVim-rb': [u'RUBY,RB', SMALL],
-    'MacVim-bash': [u'SH', SMALL],
-    'MacVim-patch': [u'DIFF', SMALL],
-    'MacVim-applescript': [u'\uf8ffSCPT,\uf8ffS', SMALL],  # apple sign
-    'MacVim-as': [u'FLASH', LINK],
-    'MacVim-asp': [u'ASP', LINK],
-    'MacVim-bib': [u'BIB', LINK],
-    'MacVim-cs': [u'C#', LINK],
-    'MacVim-csfg': [u'CFDG', LINK],
-    'MacVim-csv': [u'CSV', LINK],
-    'MacVim-tsv': [u'TSV', LINK],
-    'MacVim-cgi': [u'CGI', LINK],
-    'MacVim-cfg': [u'CFG', LINK],
-    'MacVim-css': [u'CSS', SMALL],
-    'MacVim-dtd': [u'DTD', LINK],
-    'MacVim-dylan': [u'DYLAN', LINK],
-    'MacVim-erl': [u'ERLANG,ERL', SMALL],
-    'MacVim-fscript': [u'FSCPT,FSCR,FS', SMALL],
-    'MacVim-hs': [u'HS', SMALL],
-    'MacVim-inc': [u'INC', LINK],
-    'MacVim-ics': [u'ICS', SMALL],
-    'MacVim-ini': [u'INI', LINK],
-    'MacVim-io': [u'IO', LINK],
-    'MacVim-bsh': [u'BSH', LINK],
-    'MacVim-properties': [u'PROP', LINK],
-    'MacVim-jsp': [u'JSP', SMALL],
-    'MacVim-lisp': [u'LISP,LISP,LSP', SMALL],
-    'MacVim-log': [u'LOG', SMALL],
-    'MacVim-wiki': [u'WIKI', SMALL],
-    'MacVim-ps': [u'PS', LINK],
-    #'MacVim-plist': [u'PLIST', SMALL],
-    'MacVim-sch': [u'SCHEME,SCM', SMALL],
-    'MacVim-sql': [u'SQL', SMALL],
-    'MacVim-tcl': [u'TCL', SMALL],
-    'MacVim-xsl': [u'XSL', LINK],
-    'MacVim-vcf': [u'VCARD,VCF', SMALL],
-    'MacVim-vb': [u'VBASIC,VB', LINK],
-    'MacVim-yaml': [u'YAML,YAML,YML', SMALL],
-    'MacVim-gtd': [u'GTD', LINK],
-    'MacVim-markdown': [u'MARK\u2193,M\u2193', LINK],  # down arrow
-    'MacVim-rst': [u'RST', LINK],
-    'MacVim-vba': [u'VBA', LINK],
-}
-
-
-def createLinks(icons, target):
-  assert len(icons) > 0
-  for name in icons:
-    icnsName = '%s.icns' % name
-    if os.access(icnsName, os.F_OK):
-      os.remove(icnsName)
-    os.symlink(target, icnsName)
-
-if not dont_create:
-  # define a few classes to render custom 16x16 icons
-
-  class NoTextRenderer(docerator.TextRenderer):
-    def drawTextAtSize(self, text, s):
-      if s == 16: return  # No text at 16x16
-      docerator.TextRenderer.drawTextAtSize(self, text, s)
-
-  class NoIconRenderer(docerator.BackgroundRenderer):
-    def drawIcon(self, s):
-      if s == 16: return  # no "MacVim" icon on the sheet at 16x16
-      docerator.BackgroundRenderer.drawIcon(self, s)
-
-  class SmallTextRenderer(docerator.TextRenderer):
-    def _attribsAtSize(self, s):
-      global facename
-      attribs = docerator.TextRenderer._attribsAtSize(self, s)
-      if s == 16 and facename is not None:
-        font = NSFont.fontWithName_size_(facename, 7.0)
-        assert font
-        attribs[NSFontAttributeName] = font
-        attribs[NSForegroundColorAttributeName] = \
-            NSColor.colorWithDeviceRed_green_blue_alpha_(
-                0/255.0, 82/255.0, 0/255.0, 1)
-      return attribs
-
-    def drawTextAtSize(self, text, s):
-      if s != 16:
-        docerator.TextRenderer.drawTextAtSize(self, text, s)
-        return
-      text = NSString.stringWithString_(text.lower()[0:3])  # at most 3 chars
-      attribs = self.attribsAtSize(s)
-      if len(text) <= 2:
-        attribs[NSKernAttributeName] = 0  # we have some space
-      else:
-        attribs[NSKernAttributeName] = -1  # we need all the room we can get
-      text.drawInRect_withAttributes_( ((1, 2), (15, 11)), attribs)
-
-def main():
-  if dont_create:
-    print "PyObjC not found, only using a stock icon for document icons."
-    # Can't use the constants from docerator in this case
-    import shutil
-    shutil.copyfile(DEFAULT_BACKGROUND, '%s.icns' % GENERIC_ICON_NAME)
-    createLinks([name for name in vimIcons if name != GENERIC_ICON_NAME],
-        '%s.icns' % GENERIC_ICON_NAME)
-    return
-
-  # choose an icon font
-  global fontname, facename
-  # Thanks to DamienG for Envy Code R (redistributed with permission):
-  # http://damieng.com/blog/2008/05/26/envy-code-r-preview-7-coding-font-released
-  fonts = [('Envy Code R Bold.ttf', 'EnvyCodeR-Bold'), 
-           ('/System/Library/Fonts/Monaco.dfont', 'Monaco')]
-  for font in fonts:
-    if loadfont.loadfont(font[0]):
-      fontname, facename = font
-      break
-  print "Building icons with font '" + fontname + "'."
-
-  srcdir = os.getcwd()
-  if len(sys.argv) > 1:
-    os.chdir(sys.argv[1])
-  appIcon = os.path.join(srcdir, APPICON)
-  makeIcns = os.path.join(srcdir, MAKEICNS)
-
-  # create LARGE and SMALL icons first...
-  for name, t in vimIcons.iteritems():
-    text, size = t
-    if size == LINK: continue
-    print name
-    if name == GENERIC_ICON_NAME:
-      # The generic icon has no text; make the appicon a bit larger
-      docerator.makedocicon(outname='%s.icns' % name, appicon=appIcon,
-          text=text, sizes=iconsizes[size], makeicns=makeIcns,
-          textrenderer=NoTextRenderer, rects={16:(0.0, 0.5533, 0.0, 0.5533)})
-    else:
-      # For the other icons, leave out appicon and render text in Envy Code R
-      docerator.makedocicon(outname='%s.icns' % name, appicon=appIcon,
-          text=text, sizes=iconsizes[size], makeicns=makeIcns,
-          textrenderer=SmallTextRenderer, backgroundrenderer=NoIconRenderer)
-
-  # ...create links later (to make sure the link targets exist)
-  createLinks([name for (name, t) in vimIcons.items() if t[1] == LINK],
-      '%s.icns' % GENERIC_ICON_NAME)
-
-
-if __name__ == '__main__':
-    main()
diff --git a/src/MacVim/icons/makeicns/IconFamily.h b/src/MacVim/icons/makeicns/IconFamily.h
deleted file mode 100644
index 18ccf4b44d..0000000000
--- a/src/MacVim/icons/makeicns/IconFamily.h
+++ /dev/null
@@ -1,190 +0,0 @@
-// IconFamily.h
-// IconFamily class interface
-// by Troy Stephens, Thomas Schnitzer, David Remahl, Nathan Day, Ben Haller, Sven Janssen, Peter Hosey, Conor Dearden, Elliot Glaysher, and Dave MacLachlan
-// version 0.9.3
-//
-// Project Home Page:
-//   http://iconfamily.sourceforge.net/
-//
-// Problems, shortcomings, and uncertainties that I'm aware of are flagged with "NOTE:".  Please address bug reports, bug fixes, suggestions, etc. to the project Forums and bug tracker at https://sourceforge.net/projects/iconfamily/
-
-/*
-    Copyright (c) 2001-2006 Troy N. Stephens
-    Portions Copyright (c) 2007 Google Inc.
-
-    Use and distribution of this source code is governed by the MIT License, whose terms are as follows.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#import <Cocoa/Cocoa.h>
-#import <Carbon/Carbon.h>
-
-// This class is a Cocoa/Objective-C wrapper for the Mac OS X Carbon API's
-// "icon family" data type.  Its main purpose is to enable Cocoa applications
-// to easily create custom file icons from NSImage instances, and thus take
-// advantage of Mac OS X's new larger RGBA "thumbnail" icon format to provide
-// richly detailed thumbnail previews of the files' contents.
-//
-// Using IconFamily, this becomes as simple as:
-//
-//      id iconFamily = [IconFamily iconFamilyWithThumbnailsOfImage:anImage];
-//      [iconFamily setAsCustomIconForFile:anExistingFile];
-//
-// You can also write an icon family to an .icns file using the -writeToFile:
-// method.
-
-@interface IconFamily : NSObject
-{
-    IconFamilyHandle hIconFamily;
-}
-
-// Convenience methods.  These use the corresponding -init... methods to return
-// an autoreleased IconFamily instance.
-
-+ (IconFamily*) iconFamily;
-+ (IconFamily*) iconFamilyWithContentsOfFile:(NSString*)path;
-+ (IconFamily*) iconFamilyWithIconOfFile:(NSString*)path;
-+ (IconFamily*) iconFamilyWithIconFamilyHandle:(IconFamilyHandle)hNewIconFamily;
-+ (IconFamily*) iconFamilyWithSystemIcon:(int)fourByteCode;
-+ (IconFamily*) iconFamilyWithThumbnailsOfImage:(NSImage*)image;
-+ (IconFamily*) iconFamilyWithThumbnailsOfImage:(NSImage*)image usingImageInterpolation:(NSImageInterpolation)imageInterpolation;
-
-// Initializes as a new, empty IconFamily.  This is IconFamily's designated
-// initializer method.
-
-- init;
-
-// Initializes an IconFamily by loading the contents of an .icns file.
-
-- initWithContentsOfFile:(NSString*)path;
-
-// Initializes an IconFamily from an existing Carbon IconFamilyHandle.
-
-- initWithIconFamilyHandle:(IconFamilyHandle)hNewIconFamily;
-
-// Initializes an IconFamily by loading the Finder icon that's assigned to a
-// file.
-
-- initWithIconOfFile:(NSString*)path;
-
-// Initializes an IconFamily by referencing a standard system icon.
-
-- initWithSystemIcon:(int)fourByteCode;
-
-// Initializes an IconFamily by creating its elements from a resampled
-// NSImage.  The second form of this method allows you to specify the degree
-// of antialiasing to be used in resampling the image, by passing in one of
-// the NSImageInterpolation... constants that are defined in
-// NSGraphicsContext.h.  The first form of this initializer simply calls the
-// second form with imageInterpolation set to NSImageInterpolationHigh, which
-// produces highly smoothed thumbnails.
-
-- initWithThumbnailsOfImage:(NSImage*)image;
-- initWithThumbnailsOfImage:(NSImage*)image usingImageInterpolation:(NSImageInterpolation)imageInterpolation;
-
-// Writes the icon family to an .icns file.
-
-- (BOOL) writeToFile:(NSString*)path;
-
-// Sets the image data for one of the icon family's elements from an
-// NSBitmapImageRep.  The "elementType" parameter must be one of the icon
-// family element types listed below, and the format of the "bitmapImageRep"
-// must match the corresponding requirements specified below.  Regardless of
-// the elementType, the bitmapImageRep must also be non-planar and have 8 bits
-// per sample.
-//
-//  elementType                       dimensions   format
-//  -------------------               ----------   ---------------------------------------
-//  kIconServices512PixelDataARGB     512 x 512   32-bit RGBA, 32-bit RGB, or 24-bit RGB
-//  kIconServices256PixelDataARGB     256 x 256   32-bit RGBA, 32-bit RGB, or 24-bit RGB
-//  kThumbnail32BitData               128 x 128   32-bit RGBA, 32-bit RGB, or 24-bit RGB
-//  kThumbnail8BitMask                128 x 128   32-bit RGBA or 8-bit intensity
-//  kLarge32BitData                   32 x  32   32-bit RGBA, 32-bit RGB, or 24-bit RGB
-//  kLarge8BitMask                    32 x  32   32-bit RGBA or 8-bit intensity
-//  kLarge1BitMask                    32 x  32   32-bit RGBA, 8-bit intensity, or 1-bit
-//  kSmall32BitData                   16 x  16   32-bit RGBA, 32-bit RGB, or 24-bit RGB
-//  kSmall8BitMask                    16 x  16   32-bit RGBA or 8-bit intensity
-//  kSmall1BitMask                    16 x  16   32-bit RGBA, 8-bit intensity, or 1-bit
-//
-// When an RGBA image is supplied to set a "Mask" element, the mask data is
-// taken from the image's alpha channel.
-//
-// NOTE: Setting an IconFamily's kLarge1BitMask seems to damage the IconFamily
-//       for some as yet unknown reason.  (If you then assign the icon family
-//       as a file's custom icon using -setAsCustomIconForFile:, the custom
-//       icon doesn't appear for the file in the Finder.)  However, both
-//	 custom icon display and mouse-click hit-testing in the Finder seem to
-//       work fine when we only set the other four elements (thus keeping the
-//       existing kLarge1BitMask from the valid icon family from which we
-//       initialized the IconFamily via -initWithContentsOfFile:, since
-//       IconFamily's -init method is currently broken...), so it seems safe
-//       to just leave the kLarge1BitMask alone.
-
-- (BOOL) setIconFamilyElement:(OSType)elementType
-           fromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep;
-
-// Gets the image data for one of the icon family's elements as a new, 32-bit
-// RGBA NSBitmapImageRep.  The specified elementType should be one of
-// kIconServices512PixelDataARGB, kIconServices256PixelDataARGB,
-// kThumbnail32BitData, kLarge32BitData, or kSmall32BitData.
-//
-// The returned NSBitmapImageRep will have the corresponding 8-bit mask data
-// in its alpha channel, or a fully opaque alpha channel if the icon family
-// has no 8-bit mask data for the specified alpha channel.
-//
-// Returns nil if the requested element cannot be retrieved (e.g. if the
-// icon family has no such 32BitData element).
-
-- (NSBitmapImageRep*) bitmapImageRepWithAlphaForIconFamilyElement:(OSType)elementType;
-
-// Creates and returns an NSImage that contains the icon family's various
-// elements as its NSImageReps.
-
-- (NSImage*) imageWithAllReps;
-
-// NOTE: Planned method -- not yet implemented.
-//
-// Gets the image data for one of the icon family's elements as a new
-// NSBitmapImageRep.  The specified elementType should be one of
-// kThumbnail32BitData, kThumbnail8BitMask, kLarge32BitData, kLarge8BitMask,
-// kLarge1BitMask, kSmall32BitData, kSmall8BitMask, or kSmall1BitMask.
-
-// - (NSBitmapImageRep*) bitmapImageRepForIconFamilyElement:(OSType)elementType;
-
-// Writes the icon family to the resource fork of the specified file as its
-// kCustomIconResource, and sets the necessary Finder bits so the icon will
-// be displayed for the file in Finder views.
-
-- (BOOL) setAsCustomIconForFile:(NSString*)path;
-- (BOOL) setAsCustomIconForFile:(NSString*)path withCompatibility:(BOOL)compat;
-
-// Same as the -setAsCustomIconForFile:... methods, but for folders (directories).
-
-- (BOOL) setAsCustomIconForDirectory:(NSString*)path;
-- (BOOL) setAsCustomIconForDirectory:(NSString*)path withCompatibility:(BOOL)compat;
-
-// Removes the custom icon (if any) from the specified file's resource fork,
-// and clears the necessary Finder bits for the file.  (Note that this is a
-// class method, so you don't need an instance of IconFamily to invoke it.)
-
-+ (BOOL) removeCustomIconFromFile:(NSString*)path;
-
-@end
-
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1050  // Scrap Manager has been nixed on Snow Leopard
-// Methods for interfacing with the Carbon Scrap Manager (analogous to and
-// interoperable with the Cocoa Pasteboard).
-@interface IconFamily (ScrapAdditions)
-+ (BOOL) canInitWithScrap;
-+ (IconFamily*) iconFamilyWithScrap;
-- initWithScrap;
-- (BOOL) putOnScrap;
-@end
-#endif
-
diff --git a/src/MacVim/icons/makeicns/IconFamily.m b/src/MacVim/icons/makeicns/IconFamily.m
deleted file mode 100644
index 09bd0f26ac..0000000000
--- a/src/MacVim/icons/makeicns/IconFamily.m
+++ /dev/null
@@ -1,1577 +0,0 @@
-// IconFamily.m
-// IconFamily class implementation
-// by Troy Stephens, Thomas Schnitzer, David Remahl, Nathan Day, Ben Haller, Sven Janssen, Peter Hosey, Conor Dearden, Elliot Glaysher, and Dave MacLachlan
-// version 0.9.3
-//
-// Project Home Page:
-//   http://iconfamily.sourceforge.net/
-//
-// Problems, shortcomings, and uncertainties that I'm aware of are flagged with "NOTE:".  Please address bug reports, bug fixes, suggestions, etc. to the project Forums and bug tracker at https://sourceforge.net/projects/iconfamily/
-
-/*
-    Copyright (c) 2001-2006 Troy N. Stephens
-    Portions Copyright (c) 2007 Google Inc.
-
-    Use and distribution of this source code is governed by the MIT License, whose terms are as follows.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#import "IconFamily.h"
-#import "NSString+CarbonFSRefCreation.h"
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
-// This is defined in 10.5 and beyond in IconStorage.h
-enum {
-  kIconServices512PixelDataARGB = 'ic09' /* non-premultiplied 512x512 ARGB bitmap*/
-};
-#endif
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_3
-// This is defined in 10.4 and beyond in IconStorage.h
-enum {
-  kIconServices256PixelDataARGB = 'ic08' /* non-premultiplied 256x256 ARGB bitmap*/
-};
-#endif
-
-
-@interface IconFamily (Internals)
-
-+ (NSImage*) resampleImage:(NSImage*)image toIconWidth:(int)width usingImageInterpolation:(NSImageInterpolation)imageInterpolation;
-
-+ (Handle) get32BitDataFromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep requiredPixelSize:(int)requiredPixelSize;
-
-+ (Handle) get8BitDataFromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep requiredPixelSize:(int)requiredPixelSize;
-
-+ (Handle) get8BitMaskFromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep requiredPixelSize:(int)requiredPixelSize;
-
-+ (Handle) get1BitMaskFromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep requiredPixelSize:(int)requiredPixelSize;
-
-- (BOOL) addResourceType:(OSType)type asResID:(int)resID;
-
-@end
-
-@implementation IconFamily
-
-+ (IconFamily*) iconFamily
-{
-    return [[[IconFamily alloc] init] autorelease];
-}
-
-+ (IconFamily*) iconFamilyWithContentsOfFile:(NSString*)path
-{
-    return [[[IconFamily alloc] initWithContentsOfFile:path] autorelease];
-}
-
-+ (IconFamily*) iconFamilyWithIconOfFile:(NSString*)path
-{
-    return [[[IconFamily alloc] initWithIconOfFile:path] autorelease];
-}
-
-+ (IconFamily*) iconFamilyWithIconFamilyHandle:(IconFamilyHandle)hNewIconFamily
-{
-    return [[[IconFamily alloc] initWithIconFamilyHandle:hNewIconFamily] autorelease];
-}
-
-+ (IconFamily*) iconFamilyWithSystemIcon:(int)fourByteCode
-{
-    return [[[IconFamily alloc] initWithSystemIcon:fourByteCode] autorelease];
-}
-
-+ (IconFamily*) iconFamilyWithThumbnailsOfImage:(NSImage*)image
-{
-    return [[[IconFamily alloc] initWithThumbnailsOfImage:image] autorelease];
-}
-
-+ (IconFamily*) iconFamilyWithThumbnailsOfImage:(NSImage*)image usingImageInterpolation:(NSImageInterpolation)imageInterpolation
-{
-    return [[[IconFamily alloc] initWithThumbnailsOfImage:image usingImageInterpolation:imageInterpolation] autorelease];
-}
-
-// This is IconFamily's designated initializer.  It creates a new IconFamily that initially has no elements.
-//
-// The proper way to do this is to simply allocate a zero-sized handle (not to be confused with an empty handle) and assign it to hIconFamily.  This technique works on Mac OS X 10.2 as well as on 10.0.x and 10.1.x.  Our previous technique of allocating an IconFamily struct with a resourceSize of 0 no longer works as of Mac OS X 10.2.
-- init
-{
-    self = [super init];
-    if (self) {
-        hIconFamily = (IconFamilyHandle) NewHandle( 0 );
-        if (hIconFamily == NULL) {
-            [self autorelease];
-            return nil;
-        }
-    }
-    return self;
-}
-
-- initWithContentsOfFile:(NSString*)path
-{
-    FSRef ref;
-    OSStatus result;
-
-    self = [self init];
-    if (self) {
-        if (hIconFamily) {
-            DisposeHandle( (Handle)hIconFamily );
-            hIconFamily = NULL;
-        }
-		if (![path getFSRef:&ref createFileIfNecessary:NO]) {
-			[self autorelease];
-			return nil;
-		}
-		result = ReadIconFromFSRef( &ref, &hIconFamily );
-		if (result != noErr) {
-			[self autorelease];
-			return nil;
-		}
-    }
-    return self;
-}
-
-- initWithIconFamilyHandle:(IconFamilyHandle)hNewIconFamily
-{
-    self = [self init];
-    if (self) {
-        if (hIconFamily) {
-            DisposeHandle( (Handle)hIconFamily );
-            hIconFamily = NULL;
-        }
-        hIconFamily = hNewIconFamily;
-    }
-    return self;
-}
-
-- initWithIconOfFile:(NSString*)path
-{
-    IconRef	iconRef;
-    OSStatus	result;
-    SInt16	label;
-    FSRef	ref;
-
-    self = [self init];
-    if (self)
-    {
-        if (hIconFamily)
-        {
-            DisposeHandle( (Handle)hIconFamily );
-            hIconFamily = NULL;
-        }
-
-        if( ![path getFSRef:&ref createFileIfNecessary:NO] )
-        {
-            [self autorelease];
-            return nil;
-        }
-
-        result = GetIconRefFromFileInfo(
-                                        &ref,
-                                        /*inFileNameLength*/ 0,
-                                        /*inFileName*/ NULL,
-                                        kFSCatInfoNone,
-                                        /*inCatalogInfo*/ NULL,
-                                        kIconServicesNormalUsageFlag,
-                                        &iconRef,
-                                        &label );
-
-        if (result != noErr)
-        {
-            [self autorelease];
-            return nil;
-        }
-
-        result = IconRefToIconFamily(
-                                     iconRef,
-                                     kSelectorAllAvailableData,
-                                     &hIconFamily );
-
-        ReleaseIconRef( iconRef );
-
-        if (result != noErr || !hIconFamily)
-        {
-            [self autorelease];
-            return nil;
-        }
-    }
-    return self;
-}
-
-- initWithSystemIcon:(int)fourByteCode
-{
-    IconRef	iconRef;
-    OSErr	result;
-
-    self = [self init];
-    if (self)
-    {
-        if (hIconFamily)
-        {
-            DisposeHandle( (Handle)hIconFamily );
-            hIconFamily = NULL;
-        }
-
-        result = GetIconRef(kOnSystemDisk, kSystemIconsCreator, fourByteCode, &iconRef);
-
-        if (result != noErr)
-        {
-            [self autorelease];
-            return nil;
-        }
-
-        result = IconRefToIconFamily(
-                                     iconRef,
-                                     kSelectorAllAvailableData,
-                                     &hIconFamily );
-
-        if (result != noErr || !hIconFamily)
-        {
-            [self autorelease];
-            return nil;
-        }
-
-        ReleaseIconRef( iconRef );
-    }
-    return self;
-}
-
-- initWithThumbnailsOfImage:(NSImage*)image
-{
-    // The default is to use a high degree of antialiasing, producing a smooth image.
-    return [self initWithThumbnailsOfImage:image usingImageInterpolation:NSImageInterpolationHigh];
-}
-
-- initWithThumbnailsOfImage:(NSImage*)image usingImageInterpolation:(NSImageInterpolation)imageInterpolation
-{
-    NSImage* iconImage512x512;
-    NSImage* iconImage256x256;
-    NSImage* iconImage128x128;
-    NSImage* iconImage32x32;
-    NSImage* iconImage16x16;
-    NSImage* bitmappedIconImage512x512;
-    NSBitmapImageRep* iconBitmap512x512;
-    NSBitmapImageRep* iconBitmap256x256;
-    NSBitmapImageRep* iconBitmap128x128;
-    NSBitmapImageRep* iconBitmap32x32;
-    NSBitmapImageRep* iconBitmap16x16;
-
-    // Start with a new, empty IconFamily.
-    self = [self init];
-    if (self == nil)
-        return nil;
-
-    // Resample the given image to create a 512x512 pixel, 32-bit RGBA
-    // version, and use that as our "thumbnail" (512x512) icon and mask.
-    //
-    // Our +resampleImage:toIconWidth:... method, in its present form,
-    // returns an NSImage that contains an NSCacheImageRep, rather than
-    // an NSBitmapImageRep.  We convert to an NSBitmapImageRep, so that
-    // our methods can scan the image data, using initWithFocusedViewRect:.
-    iconImage512x512 = [IconFamily resampleImage:image toIconWidth:512 usingImageInterpolation:imageInterpolation];
-    if (!iconImage512x512) {
-      [self autorelease];
-      return nil;
-    }
-
-    [iconImage512x512 lockFocus];
-    iconBitmap512x512 = [[NSBitmapImageRep alloc] initWithFocusedViewRect:NSMakeRect(0, 0, 512, 512)];
-    [iconImage512x512 unlockFocus];
-    if (!iconBitmap512x512) {
-      [self release];
-      return nil;
-    }
-    // Create an NSImage with the iconBitmap512x512 NSBitmapImageRep, that we
-    // can resample to create the smaller icon family elements.  (This is
-    // most likely more efficient than resampling from the original image again,
-    // particularly if it is large.  It produces a slightly different result, but
-    // the difference is minor and should not be objectionable...)
-
-    bitmappedIconImage512x512 = [[NSImage alloc] initWithSize:NSMakeSize(512, 512)];
-    [bitmappedIconImage512x512 addRepresentation:iconBitmap512x512];
-
-    if (!bitmappedIconImage512x512) {
-      [self autorelease];
-      return nil;
-    }
-
-    [self setIconFamilyElement:kIconServices512PixelDataARGB fromBitmapImageRep:iconBitmap512x512];
-    [iconBitmap512x512 release];
-
-    iconImage256x256 = [IconFamily resampleImage:bitmappedIconImage512x512 toIconWidth:256 usingImageInterpolation:imageInterpolation];
-    if (iconImage256x256) {
-      [iconImage256x256 lockFocus];
-      iconBitmap256x256 = [[NSBitmapImageRep alloc] initWithFocusedViewRect:NSMakeRect(0, 0, 256, 256)];
-      [iconImage256x256 unlockFocus];
-      if (iconBitmap256x256) {
-        [self setIconFamilyElement:kIconServices256PixelDataARGB fromBitmapImageRep:iconBitmap256x256];
-        [iconBitmap256x256 release];
-      }
-    }
-
-    iconImage128x128 = [IconFamily resampleImage:bitmappedIconImage512x512 toIconWidth:128 usingImageInterpolation:imageInterpolation];
-    if (iconImage128x128) {
-      [iconImage128x128 lockFocus];
-      iconBitmap128x128 = [[NSBitmapImageRep alloc] initWithFocusedViewRect:NSMakeRect(0, 0, 128, 128)];
-      [iconImage128x128 unlockFocus];
-
-      if (iconBitmap128x128) {
-        [self setIconFamilyElement:kThumbnail32BitData fromBitmapImageRep:iconBitmap128x128];
-        [self setIconFamilyElement:kThumbnail8BitMask  fromBitmapImageRep:iconBitmap128x128];
-        [iconBitmap128x128 release];
-      }
-    }
-
-    // Resample the 512x512 image to create a 32x32 pixel, 32-bit RGBA version,
-    // and use that as our "large" (32x32) icon and 8-bit mask.
-    iconImage32x32 = [IconFamily resampleImage:bitmappedIconImage512x512 toIconWidth:32 usingImageInterpolation:imageInterpolation];
-    if (iconImage32x32) {
-      [iconImage32x32 lockFocus];
-      iconBitmap32x32 = [[NSBitmapImageRep alloc] initWithFocusedViewRect:NSMakeRect(0, 0, 32, 32)];
-      [iconImage32x32 unlockFocus];
-      if (iconBitmap32x32) {
-        [self setIconFamilyElement:kLarge32BitData fromBitmapImageRep:iconBitmap32x32];
-        [self setIconFamilyElement:kLarge8BitData fromBitmapImageRep:iconBitmap32x32];
-        [self setIconFamilyElement:kLarge8BitMask fromBitmapImageRep:iconBitmap32x32];
-        [self setIconFamilyElement:kLarge1BitMask fromBitmapImageRep:iconBitmap32x32];
-        [iconBitmap32x32 release];
-      }
-    }
-
-    // Resample the 512x512 image to create a 16x16 pixel, 32-bit RGBA version,
-    // and use that as our "small" (16x16) icon and 8-bit mask.
-    iconImage16x16 = [IconFamily resampleImage:bitmappedIconImage512x512 toIconWidth:16 usingImageInterpolation:imageInterpolation];
-    if (iconImage16x16) {
-      [iconImage16x16 lockFocus];
-      iconBitmap16x16 = [[NSBitmapImageRep alloc] initWithFocusedViewRect:NSMakeRect(0, 0, 16, 16)];
-      [iconImage16x16 unlockFocus];
-      if (iconBitmap16x16) {
-        [self setIconFamilyElement:kSmall32BitData fromBitmapImageRep:iconBitmap16x16];
-        [self setIconFamilyElement:kSmall8BitData fromBitmapImageRep:iconBitmap16x16];
-        [self setIconFamilyElement:kSmall8BitMask fromBitmapImageRep:iconBitmap16x16];
-        [self setIconFamilyElement:kSmall1BitMask fromBitmapImageRep:iconBitmap16x16];
-        [iconBitmap16x16 release];
-      }
-    }
-
-    // Release the icon.
-    [bitmappedIconImage512x512 release];
-
-    // Return the new icon family!
-    return self;
-}
-
-- (void) dealloc
-{
-    DisposeHandle( (Handle)hIconFamily );
-    [super dealloc];
-}
-
-- (NSBitmapImageRep*) bitmapImageRepWithAlphaForIconFamilyElement:(OSType)elementType;
-{
-    NSBitmapImageRep* bitmapImageRep;
-    int pixelsWide;
-    Handle hRawBitmapData;
-    Handle hRawMaskData;
-    OSType maskElementType;
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
-	NSBitmapFormat bitmapFormat = NSAlphaFirstBitmapFormat;
-#endif
-    OSErr result;
-    unsigned long* pRawBitmapData;
-    unsigned long* pRawBitmapDataEnd;
-    unsigned char* pRawMaskData;
-    unsigned char* pBitmapImageRepBitmapData;
-
-    // Make sure elementType is a valid type that we know how to handle, and
-    // figure out the dimensions and bit depth of the bitmap for that type.
-    switch (elementType) {
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_5
-    // 'ic09' 512x512 32-bit RGB image
-    case kIconServices512PixelDataARGB:
-        maskElementType = 0;
-        pixelsWide = 512;
-        break;
-#endif
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
-	// 'ic08' 256x256 32-bit ARGB image
-	case kIconServices256PixelDataARGB:
-		maskElementType = 0;
-		pixelsWide = 256;
-	    break;
-#endif
-
-	// 'it32' 128x128 32-bit RGB image
-	case kThumbnail32BitData:
-		maskElementType = kThumbnail8BitMask;
-		pixelsWide = 128;
-	    break;
-
-	// 'ih32' 48x48 32-bit RGB image
-	case kHuge32BitData:
-		maskElementType = kHuge8BitMask;
-		pixelsWide = 48;
-	    break;
-
-	// 'il32' 32x32 32-bit RGB image
-	case kLarge32BitData:
-		maskElementType = kLarge8BitMask;
-		pixelsWide = 32;
-	    break;
-
-	// 'is32' 16x16 32-bit RGB image
-	case kSmall32BitData:
-		maskElementType = kSmall8BitMask;
-		pixelsWide = 16;
-	    break;
-
-	default:
-	    return nil;
-    }
-
-    // Get the raw, uncompressed bitmap data for the requested element.
-    hRawBitmapData = NewHandle( pixelsWide * pixelsWide * 4 );
-    result = GetIconFamilyData( hIconFamily, elementType, hRawBitmapData );
-    if (result != noErr) {
-        DisposeHandle( hRawBitmapData );
-        return nil;
-    }
-
-    if (maskElementType) {
-        // Get the corresponding raw, uncompressed 8-bit mask data.
-        hRawMaskData = NewHandle( pixelsWide * pixelsWide );
-        result = GetIconFamilyData( hIconFamily, maskElementType, hRawMaskData );
-        if (result != noErr) {
-            DisposeHandle( hRawMaskData );
-            hRawMaskData = NULL;
-        }
-    }
-
-    // The retrieved raw bitmap data is stored in memory as 32 bit per pixel, 8 bit per sample xRGB data.  (The sample order provided by IconServices is the same, regardless of whether we're running on a big-endian (PPC) or little-endian (Intel) architecture.)
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
-    // With proper attention to byte order, we can fold the mask data into the color data in-place, producing ARGB data suitable for handing off to NSBitmapImageRep.
-#else
-    // With proper attention to byte order, we can fold the mask data into the color data in-place, producing RGBA data suitable for handing off to NSBitmapImageRep.
-#endif
-//    HLock( hRawBitmapData ); // Handle-based memory isn't compacted anymore, so calling HLock()/HUnlock() is unnecessary.
-    pRawBitmapData = (unsigned long*) *hRawBitmapData;
-    pRawBitmapDataEnd = pRawBitmapData + pixelsWide * pixelsWide;
-    if (hRawMaskData) {
-//        HLock( hRawMaskData ); // Handle-based memory isn't compacted anymore, so calling HLock()/HUnlock() is unnecessary.
-        pRawMaskData = (unsigned char*) *hRawMaskData;
-        while (pRawBitmapData < pRawBitmapDataEnd) {
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
-            // Convert the xRGB pixel data to ARGB.
-            //                                                          PowerPC         Intel
-            //                                                          -------         -----
-            // Bytes in memory are                                      x R G B         x R G B
-            // *pRawBitmapData loads as 32-bit word into register       xRGB            BGRx
-            // NSSwapHostLongToBig() swaps this to                      xRGB            xRGB
-            // Loading *pRawMaskData and shifting left 24 bits yields   A000            A000
-            // Bitwise ORing these two words together yields            ARGB            ARGB
-            // NSSwapBigLongToHost() swaps this to                      ARGB            BGRA
-            // Bytes in memory after they're stored as a 32-bit word    A R G B         A R G B
-            *pRawBitmapData = NSSwapBigLongToHost((*pRawMaskData++ << 24) | NSSwapHostLongToBig(*pRawBitmapData));
-#else
-            // Convert the xRGB pixel data to RGBA.
-            //                                                          PowerPC         Intel
-            //                                                          -------         -----
-            // Bytes in memory are                                      x R G B         x R G B
-            // *pRawBitmapData loads as 32-bit word into register       xRGB            BGRx
-            // NSSwapHostLongToBig() swaps this to                      xRGB            xRGB
-            // Shifting left 8 bits yields ('0' denotes all zero bits)  RGB0            RGB0
-            // Bitwise ORing with *pRawMaskData byte yields             RGBA            RGBA
-            // NSSwapBigLongToHost() swaps this to                      RGBA            ABGR
-            // Bytes in memory after they're stored as a 32-bit word    R G B A         R G B A
-            *pRawBitmapData = NSSwapBigLongToHost((NSSwapHostLongToBig(*pRawBitmapData) << 8) | *pRawMaskData++);
-#endif
-            ++pRawBitmapData;
-        }
-//        HUnlock( hRawMaskData ); // Handle-based memory isn't compacted anymore, so calling HLock()/HUnlock() is unnecessary.
-    } else {
-        if(maskElementType) {
-            // We SHOULD have a mask, but apparently not. Fake it with alpha=1.
-            while (pRawBitmapData < pRawBitmapDataEnd) {
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
-                // Set alpha byte to 0xff.
-                //                                                                  PowerPC         Intel
-                //                                                                  -------         -----
-                // Bytes in memory are                                              x R G B         x R G B
-                // Writing a single 0xff byte ('1') at pRawBitmapData yields        1 R G B         1 R G B
-                *(unsigned char *)pRawBitmapData = 0xff;
-#else
-                // Set alpha byte to 0xff.
-                //                                                                  PowerPC         Intel
-                //                                                                  -------         -----
-                // Bytes in memory are                                              R G B x         R G B x
-                // Writing a single 0xff byte, 3 bytes past pRawBitmapData yields   R G B 1         R G B 1
-                *((unsigned char *)pRawBitmapData + 3) = 0xff;
-#endif
-                ++pRawBitmapData;
-            }
-        }
-    }
-
-    // Create a new NSBitmapImageRep with the given bitmap data.  Note that
-    // when creating the NSBitmapImageRep we pass in NULL for the "planes"
-    // parameter.  This causes the new NSBitmapImageRep to allocate its own
-    // buffer for the bitmap data (which it will own and release when the
-    // NSBitmapImageRep is released), rather than referencing the bitmap
-    // data we pass in (which will soon disappear when we call
-    // DisposeHandle() below!).  (See the NSBitmapImageRep documentation for
-    // the -initWithBitmapDataPlanes:... method, where this is explained.)
-    //
-    // Once we have the new NSBitmapImageRep, we get a pointer to its
-    // bitmapData and copy our bitmap data in.
-    bitmapImageRep = [[[NSBitmapImageRep alloc]
-        initWithBitmapDataPlanes:NULL
-                      pixelsWide:pixelsWide
-                      pixelsHigh:pixelsWide
-                   bitsPerSample:8
-                 samplesPerPixel:4
-                        hasAlpha:YES
-                        isPlanar:NO
-                  colorSpaceName:NSDeviceRGBColorSpace // NOTE: is this right?
-#if MAC_OS_X_VERSION_MAX_ALLOWED >= MAC_OS_X_VERSION_10_4
-                    bitmapFormat:bitmapFormat
-#endif
-                     bytesPerRow:0
-                    bitsPerPixel:0] autorelease];
-    pBitmapImageRepBitmapData = [bitmapImageRep bitmapData];
-    if (pBitmapImageRepBitmapData) {
-        memcpy( pBitmapImageRepBitmapData, *hRawBitmapData,
-                pixelsWide * pixelsWide * 4 );
-    }
-//    HUnlock( hRawBitmapData ); // Handle-based memory isn't compacted anymore, so calling HLock()/HUnlock() is unnecessary.
-
-    // Free the retrieved raw data.
-    DisposeHandle( hRawBitmapData );
-    if (hRawMaskData)
-        DisposeHandle( hRawMaskData );
-
-    // Return nil if the NSBitmapImageRep didn't give us a buffer to copy into.
-    if (pBitmapImageRepBitmapData == NULL)
-        return nil;
-
-    // Return the new NSBitmapImageRep.
-    return bitmapImageRep;
-}
-
-- (NSImage*) imageWithAllReps
-{
-    NSImage* image = NULL;
-    image = [[[NSImage alloc] initWithData:[NSData dataWithBytes:*hIconFamily length:GetHandleSize((Handle)hIconFamily)]] autorelease];
-    return image;
-}
-
-- (BOOL) setIconFamilyElement:(OSType)elementType fromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep
-{
-    Handle hRawData = NULL;
-    OSErr result;
-
-    switch (elementType) {
-      // 'ic08' 512x512 32-bit ARGB image
-    case kIconServices512PixelDataARGB:
-        hRawData = [IconFamily get32BitDataFromBitmapImageRep:bitmapImageRep requiredPixelSize:512];
-        break;
-
-    // 'ic08' 256x256 32-bit ARGB image
-    case kIconServices256PixelDataARGB:
-        hRawData = [IconFamily get32BitDataFromBitmapImageRep:bitmapImageRep requiredPixelSize:256];
-        break;
-
-    // 'it32' 128x128 32-bit RGB image
-	case kThumbnail32BitData:
-	    hRawData = [IconFamily get32BitDataFromBitmapImageRep:bitmapImageRep requiredPixelSize:128];
-	    break;
-
-	// 't8mk' 128x128 8-bit alpha mask
-	case kThumbnail8BitMask:
-	    hRawData = [IconFamily get8BitMaskFromBitmapImageRep:bitmapImageRep requiredPixelSize:128];
-	    break;
-
-	// 'il32' 32x32 32-bit RGB image
-	case kLarge32BitData:
-	    hRawData = [IconFamily get32BitDataFromBitmapImageRep:bitmapImageRep requiredPixelSize:32];
-	    break;
-
-	// 'l8mk' 32x32 8-bit alpha mask
-	case kLarge8BitMask:
-	    hRawData = [IconFamily get8BitMaskFromBitmapImageRep:bitmapImageRep requiredPixelSize:32];
-	    break;
-
-	// 'ICN#' 32x32 1-bit alpha mask
-	case kLarge1BitMask:
-	    hRawData = [IconFamily get1BitMaskFromBitmapImageRep:bitmapImageRep requiredPixelSize:32];
-	    break;
-
-	// 'icl8' 32x32 8-bit indexed image data
-	case kLarge8BitData:
-		hRawData = [IconFamily get8BitDataFromBitmapImageRep:bitmapImageRep requiredPixelSize:32];
-		break;
-
-	// 'is32' 16x16 32-bit RGB image
-	case kSmall32BitData:
-		hRawData = [IconFamily get32BitDataFromBitmapImageRep:bitmapImageRep requiredPixelSize:16];
-		break;
-
-	// 's8mk' 16x16 8-bit alpha mask
-	case kSmall8BitMask:
-	    hRawData = [IconFamily get8BitMaskFromBitmapImageRep:bitmapImageRep requiredPixelSize:16];
-	    break;
-
-	// 'ics#' 16x16 1-bit alpha mask
-	case kSmall1BitMask:
-	    hRawData = [IconFamily get1BitMaskFromBitmapImageRep:bitmapImageRep requiredPixelSize:16];
-	    break;
-
-	// 'ics8' 16x16 8-bit indexed image data
-	case kSmall8BitData:
-		hRawData = [IconFamily get8BitDataFromBitmapImageRep:bitmapImageRep requiredPixelSize:16];
-		break;
-
-	default:
-	    return NO;
-    }
-
-	// NSLog(@"setIconFamilyElement:%@ fromBitmapImageRep:%@ generated handle %p of size %d", NSFileTypeForHFSTypeCode(elementType), bitmapImageRep, hRawData, GetHandleSize(hRawData));
-
-    if (hRawData == NULL)
-	{
-		NSLog(@"Null data returned to setIconFamilyElement:fromBitmapImageRep:");
-		return NO;
-	}
-
-    result = SetIconFamilyData( hIconFamily, elementType, hRawData );
-    DisposeHandle( hRawData );
-
-    if (result != noErr)
-	{
-		NSLog(@"SetIconFamilyData() returned error %d", result);
-		return NO;
-	}
-
-    return YES;
-}
-
-- (BOOL) setAsCustomIconForFile:(NSString*)path
-{
-    return( [self setAsCustomIconForFile:path withCompatibility:NO] );
-}
-
-- (BOOL) setAsCustomIconForFile:(NSString*)path withCompatibility:(BOOL)compat
-{
-    FSRef targetFileFSRef;
-    FSRef parentDirectoryFSRef;
-    SInt16 file;
-    OSStatus result;
-    struct FSCatalogInfo catInfo;
-    struct FileInfo *finderInfo = (struct FileInfo *)&catInfo.finderInfo;
-    Handle hExistingCustomIcon;
-    Handle hIconFamilyCopy;
-	NSString *parentDirectory;
-
-    // Before we do anything, get the original modification time for the target file.
-    NSDate* modificationDate = [[[NSFileManager defaultManager] fileAttributesAtPath:path traverseLink:NO] objectForKey:NSFileModificationDate];
-
-	if ([path isAbsolutePath])
-		parentDirectory = [path stringByDeletingLastPathComponent];
-    else
-        parentDirectory = [[[NSFileManager defaultManager] currentDirectoryPath] stringByAppendingPathComponent:[path stringByDeletingLastPathComponent]];
-
-    // Get an FSRef for the target file's parent directory that we can use in
-    // the FSCreateResFile() and FNNotify() calls below.
-    if (![parentDirectory getFSRef:&parentDirectoryFSRef createFileIfNecessary:NO])
-		return NO;
-
-	// Get the name of the file, for FSCreateResFile.
-	struct HFSUniStr255 filename;
-	NSString *filenameString = [path lastPathComponent];
-	filename.length = [filenameString length];
-	[filenameString getCharacters:filename.unicode];
-
-    // Make sure the file has a resource fork that we can open.  (Although
-    // this sounds like it would clobber an existing resource fork, the Carbon
-    // Resource Manager docs for this function say that's not the case.  If
-    // the file already has a resource fork, we receive a result code of
-    // dupFNErr, which is not really an error per se, but just a notification
-    // to us that creating a new resource fork for the file was not necessary.)
-	FSCreateResFile(
-	                &parentDirectoryFSRef,
-	                filename.length,
-	                filename.unicode,
-	                kFSCatInfoNone,
-	                /*catalogInfo/*/ NULL,
-	                &targetFileFSRef,
-	                /*newSpec*/ NULL);
-	result = ResError();
-	if (result == dupFNErr) {
-        // If the call to FSCreateResFile() returned dupFNErr, targetFileFSRef will not have been set, so create it from the path.
-        if (![path getFSRef:&targetFileFSRef createFileIfNecessary:NO])
-            return NO;
-    } else if (result != noErr) {
-		return NO;
-    }
-
-    // Open the file's resource fork.
-    file = FSOpenResFile( &targetFileFSRef, fsRdWrPerm );
-    if (file == -1)
-		return NO;
-
-    // Make a copy of the icon family data to pass to AddResource().
-    // (AddResource() takes ownership of the handle we pass in; after the
-    // CloseResFile() call its master pointer will be set to 0xffffffff.
-    // We want to keep the icon family data, so we make a copy.)
-    // HandToHand() returns the handle of the copy in hIconFamily.
-    hIconFamilyCopy = (Handle) hIconFamily;
-    result = HandToHand( &hIconFamilyCopy );
-    if (result != noErr) {
-        CloseResFile( file );
-        return NO;
-    }
-
-    // Remove the file's existing kCustomIconResource of type kIconFamilyType
-    // (if any).
-    hExistingCustomIcon = GetResource( kIconFamilyType, kCustomIconResource );
-    if( hExistingCustomIcon )
-        RemoveResource( hExistingCustomIcon );
-
-    // Now add our icon family as the file's new custom icon.
-    AddResource( (Handle)hIconFamilyCopy, kIconFamilyType,
-                 kCustomIconResource, "\p");
-    if (ResError() != noErr) {
-        CloseResFile( file );
-        return NO;
-    }
-
-    if( compat )
-    {
-        [self addResourceType:kLarge8BitData asResID:kCustomIconResource];
-        [self addResourceType:kLarge1BitMask asResID:kCustomIconResource];
-        [self addResourceType:kSmall8BitData asResID:kCustomIconResource];
-        [self addResourceType:kSmall1BitMask asResID:kCustomIconResource];
-    }
-
-    // Close the file's resource fork, flushing the resource map and new icon
-    // data out to disk.
-    CloseResFile( file );
-    if (ResError() != noErr)
-		return NO;
-
-    // Prepare to get the Finder info.
-
-    // Now we need to set the file's Finder info so the Finder will know that
-    // it has a custom icon.  Start by getting the file's current finder info:
-    result = FSGetCatalogInfo(
-	                          &targetFileFSRef,
-	                          kFSCatInfoFinderInfo,
-	                          &catInfo,
-	                          /*outName*/ NULL,
-	                          /*fsSpec*/ NULL,
-	                          /*parentRef*/ NULL);
-    if (result != noErr)
-		return NO;
-
-    // Set the kHasCustomIcon flag, and clear the kHasBeenInited flag.
-    //
-    // From Apple's "CustomIcon" code sample:
-    //     "set bit 10 (has custom icon) and unset the inited flag
-    //      kHasBeenInited is 0x0100 so the mask will be 0xFEFF:"
-    //    finderInfo.fdFlags = 0xFEFF & (finderInfo.fdFlags | kHasCustomIcon ) ;
-    finderInfo->finderFlags = (finderInfo->finderFlags | kHasCustomIcon ) & ~kHasBeenInited;
-
-    // Now write the Finder info back.
-    result = FSSetCatalogInfo( &targetFileFSRef, kFSCatInfoFinderInfo, &catInfo );
-    if (result != noErr)
-		return NO;
-
-    // Now set the modification time back to when the file was actually last modified.
-    NSDictionary* attributes = [NSDictionary dictionaryWithObjectsAndKeys:modificationDate, NSFileModificationDate, nil];
-    [[NSFileManager defaultManager] changeFileAttributes:attributes atPath:path];
-
-    // Notify the system that the directory containing the file has changed, to
-    // give Finder the chance to find out about the file's new custom icon.
-    result = FNNotify( &parentDirectoryFSRef, kFNDirectoryModifiedMessage, kNilOptions );
-    if (result != noErr)
-        return NO;
-
-    return YES;
-}
-
-+ (BOOL) removeCustomIconFromFile:(NSString*)path
-{
-    FSRef targetFileFSRef;
-    FSRef parentDirectoryFSRef;
-    SInt16 file;
-    OSStatus result;
-    struct FSCatalogInfo catInfo;
-    struct FileInfo *finderInfo = (struct FileInfo *)&catInfo.finderInfo;
-    Handle hExistingCustomIcon;
-
-    // Get an FSRef for the target file.
-    if (![path getFSRef:&targetFileFSRef createFileIfNecessary:NO])
-        return NO;
-
-    // Open the file's resource fork, if it has one.
-    file = FSOpenResFile( &targetFileFSRef, fsRdWrPerm );
-    if (file == -1)
-        return NO;
-
-    // Remove the file's existing kCustomIconResource of type kIconFamilyType
-    // (if any).
-    hExistingCustomIcon = GetResource( kIconFamilyType, kCustomIconResource );
-    if( hExistingCustomIcon )
-        RemoveResource( hExistingCustomIcon );
-
-    // Close the file's resource fork, flushing the resource map out to disk.
-    CloseResFile( file );
-    if (ResError() != noErr)
-        return NO;
-
-    // Now we need to set the file's Finder info so the Finder will know that
-    // it has no custom icon. Start by getting the file's current Finder info.
-    // Also get an FSRef for its parent directory, that we can use in the
-    // FNNotify() call below.
-    result = FSGetCatalogInfo(
-                              &targetFileFSRef,
-                              kFSCatInfoFinderInfo,
-                              &catInfo,
-                              /*outName*/ NULL,
-                              /*fsSpec*/ NULL,
-                              &parentDirectoryFSRef );
-    if (result != noErr)
-        return NO;
-
-    // Clear the kHasCustomIcon flag and the kHasBeenInited flag.
-    finderInfo->finderFlags = finderInfo->finderFlags & ~(kHasCustomIcon | kHasBeenInited);
-
-    // Now write the Finder info back.
-    result = FSSetCatalogInfo( &targetFileFSRef, kFSCatInfoFinderInfo, &catInfo );
-    if (result != noErr)
-        return NO;
-
-    // Notify the system that the directory containing the file has changed, to give Finder the chance to find out about the file's new custom icon.
-    result = FNNotify( &parentDirectoryFSRef, kFNDirectoryModifiedMessage, kNilOptions );
-    if (result != noErr)
-        return NO;
-
-    return YES;
-}
-
-- (BOOL) setAsCustomIconForDirectory:(NSString*)path
-{
-    return [self setAsCustomIconForDirectory:path withCompatibility:NO];
-}
-
-- (BOOL) setAsCustomIconForDirectory:(NSString*)path withCompatibility:(BOOL)compat
-{
-    NSFileManager *fm = [NSFileManager defaultManager];
-    BOOL isDir;
-    BOOL exists;
-    NSString *iconrPath;
-    FSRef targetFolderFSRef, iconrFSRef;
-    SInt16 file;
-    OSErr result;
-    struct HFSUniStr255 filename;
-    struct FSCatalogInfo catInfo;
-    Handle hExistingCustomIcon;
-    Handle hIconFamilyCopy;
-
-    // Confirm that "path" exists and specifies a directory.
-    exists = [fm fileExistsAtPath:path isDirectory:&isDir];
-    if( !isDir || !exists )
-        return NO;
-
-    // Get an FSRef for the folder.
-    if( ![path getFSRef:&targetFolderFSRef createFileIfNecessary:NO] )
-        return NO;
-
-    // Remove and re-create any existing "Icon\r" file in the directory, and get an FSRef for it.
-    iconrPath = [path stringByAppendingPathComponent:@"Icon\r"];
-    if( [fm fileExistsAtPath:iconrPath] )
-    {
-        if( ![fm removeFileAtPath:iconrPath handler:nil] )
-            return NO;
-    }
-    if( ![iconrPath getFSRef:&iconrFSRef createFileIfNecessary:YES] )
-        return NO;
-
-    // Get type and creator information for the Icon file.
-    result = FSGetCatalogInfo(
-                              &iconrFSRef,
-                              kFSCatInfoFinderInfo,
-                              &catInfo,
-                              /*outName*/ NULL,
-                              /*fsSpec*/ NULL,
-                              /*parentRef*/ NULL );
-    if( result == fnfErr ) {
-        // The file doesn't exist. Prepare to create it.
-
-        struct FileInfo *finderInfo = (struct FileInfo *)catInfo.finderInfo;
-
-        // These are the file type and creator given to Icon files created by
-        // the Finder.
-        finderInfo->fileType = 'icon';
-        finderInfo->fileCreator = 'MACS';
-
-        // Icon files should be invisible.
-        finderInfo->finderFlags = kIsInvisible;
-
-        // Because the inited flag is not set in finderFlags above, the Finder
-        // will ignore the location, unless it's in the 'magic rectangle' of
-        // { -24,000, -24,000, -16,000, -16,000 } (technote TB42).
-        // So we need to make sure to set this to zero anyway, so that the
-        // Finder will position it automatically. If the user makes the Icon
-        // file visible for any reason, we don't want it to be positioned in an
-        // exotic corner of the window.
-        finderInfo->location.h = finderInfo->location.v = 0;
-
-        // Standard reserved-field practice.
-        finderInfo->reservedField = 0;
-    } else if( result != noErr )
-        return NO;
-
-    // Get the filename, to be applied to the Icon file.
-    filename.length = [@"Icon\r" length];
-    [@"Icon\r" getCharacters:filename.unicode];
-
-    // Make sure the file has a resource fork that we can open.  (Although
-    // this sounds like it would clobber an existing resource fork, the Carbon
-    // Resource Manager docs for this function say that's not the case.)
-    FSCreateResFile(
-                    &targetFolderFSRef,
-                    filename.length,
-                    filename.unicode,
-                    kFSCatInfoFinderInfo,
-                    &catInfo,
-                    &iconrFSRef,
-                    /*newSpec*/ NULL);
-    result = ResError();
-    if (!(result == noErr || result == dupFNErr))
-        return NO;
-
-    // Open the file's resource fork.
-    file = FSOpenResFile( &iconrFSRef, fsRdWrPerm );
-    if (file == -1)
-        return NO;
-
-    // Make a copy of the icon family data to pass to AddResource().
-    // (AddResource() takes ownership of the handle we pass in; after the
-    // CloseResFile() call its master pointer will be set to 0xffffffff.
-    // We want to keep the icon family data, so we make a copy.)
-    // HandToHand() returns the handle of the copy in hIconFamily.
-    hIconFamilyCopy = (Handle) hIconFamily;
-    result = HandToHand( &hIconFamilyCopy );
-    if (result != noErr) {
-        CloseResFile( file );
-        return NO;
-    }
-
-    // Remove the file's existing kCustomIconResource of type kIconFamilyType
-    // (if any).
-    hExistingCustomIcon = GetResource( kIconFamilyType, kCustomIconResource );
-    if( hExistingCustomIcon )
-        RemoveResource( hExistingCustomIcon );
-
-    // Now add our icon family as the file's new custom icon.
-    AddResource( (Handle)hIconFamilyCopy, kIconFamilyType,
-                 kCustomIconResource, "\p");
-
-    if (ResError() != noErr) {
-        CloseResFile( file );
-        return NO;
-    }
-
-    if( compat )
-    {
-        [self addResourceType:kLarge8BitData asResID:kCustomIconResource];
-        [self addResourceType:kLarge1BitMask asResID:kCustomIconResource];
-        [self addResourceType:kSmall8BitData asResID:kCustomIconResource];
-        [self addResourceType:kSmall1BitMask asResID:kCustomIconResource];
-    }
-
-    // Close the file's resource fork, flushing the resource map and new icon
-    // data out to disk.
-    CloseResFile( file );
-    if (ResError() != noErr)
-        return NO;
-
-    result = FSGetCatalogInfo( &targetFolderFSRef,
-                               kFSCatInfoFinderInfo,
-                               &catInfo,
-                               /*outName*/ NULL,
-                               /*fsSpec*/ NULL,
-                               /*parentRef*/ NULL);
-    if( result != noErr )
-        return NO;
-
-    // Tell the Finder that the folder now has a custom icon.
-    ((struct FolderInfo *)catInfo.finderInfo)->finderFlags = ( ((struct FolderInfo *)catInfo.finderInfo)->finderFlags | kHasCustomIcon ) & ~kHasBeenInited;
-
-    result = FSSetCatalogInfo( &targetFolderFSRef,
-                      kFSCatInfoFinderInfo,
-                      &catInfo);
-    if( result != noErr )
-        return NO;
-
-    // Notify the system that the target directory has changed, to give Finder
-    // the chance to find out about its new custom icon.
-    result = FNNotify( &targetFolderFSRef, kFNDirectoryModifiedMessage, kNilOptions );
-    if (result != noErr)
-        return NO;
-
-    return YES;
-}
-
-- (BOOL) writeToFile:(NSString*)path
-{
-    NSData* iconData = nil;
-
-//    HLock((Handle)hIconFamily); // Handle-based memory isn't compacted anymore, so calling HLock()/HUnlock() is unnecessary.
-
-    iconData = [NSData dataWithBytes:*hIconFamily length:GetHandleSize((Handle)hIconFamily)];
-    BOOL success = [iconData writeToFile:path atomically:NO];
-
-//    HUnlock((Handle)hIconFamily); // Handle-based memory isn't compacted anymore, so calling HLock()/HUnlock() is unnecessary.
-
-    return success;
-}
-
-@end
-
-@implementation IconFamily (Internals)
-
-+ (NSImage*) resampleImage:(NSImage*)image toIconWidth:(int)iconWidth usingImageInterpolation:(NSImageInterpolation)imageInterpolation
-{
-    NSGraphicsContext* graphicsContext;
-    BOOL wasAntialiasing;
-    NSImageInterpolation previousImageInterpolation;
-    NSImage* newImage;
-    NSImage* workingImage;
-    NSImageRep* workingImageRep;
-    NSSize size, pixelSize, newSize;
-    NSRect iconRect;
-    NSRect targetRect;
-
-    // Create a working copy of the image and scale its size down to fit in
-    // the square area of the icon.
-    //
-    // It seems like there should be a more memory-efficient alternative to
-    // first duplicating the entire original image, but I don't know what it
-    // is.  We need to change some properties ("size" and "scalesWhenResized")
-    // of the original image, but we shouldn't change the original, so a copy
-    // is necessary.
-    workingImage = [image copyWithZone:[image zone]];
-    [workingImage setScalesWhenResized:YES];
-    size = [workingImage size];
-    workingImageRep = [workingImage bestRepresentationForDevice:nil];
-    if ([workingImageRep isKindOfClass:[NSBitmapImageRep class]]) {
-        pixelSize.width  = [workingImageRep pixelsWide];
-        pixelSize.height = [workingImageRep pixelsHigh];
-        if (!NSEqualSizes( size, pixelSize )) {
-            [workingImage setSize:pixelSize];
-            [workingImageRep setSize:pixelSize];
-            size = pixelSize;
-        }
-    }
-    if (size.width >= size.height) {
-        newSize.width  = iconWidth;
-        newSize.height = floor( (float) iconWidth * size.height / size.width + 0.5 );
-    } else {
-        newSize.height = iconWidth;
-        newSize.width  = floor( (float) iconWidth * size.width / size.height + 0.5 );
-    }
-    [workingImage setSize:newSize];
-
-    // Create a new image the size of the icon, and clear it to transparent.
-    newImage = [[NSImage alloc] initWithSize:NSMakeSize(iconWidth,iconWidth)];
-    [newImage lockFocus];
-    iconRect.origin.x = iconRect.origin.y = 0;
-    iconRect.size.width = iconRect.size.height = iconWidth;
-    [[NSColor clearColor] set];
-    NSRectFill( iconRect );
-
-    // Set current graphics context to use antialiasing and high-quality
-    // image scaling.
-    graphicsContext = [NSGraphicsContext currentContext];
-    wasAntialiasing = [graphicsContext shouldAntialias];
-    previousImageInterpolation = [graphicsContext imageInterpolation];
-    [graphicsContext setShouldAntialias:YES];
-    [graphicsContext setImageInterpolation:imageInterpolation];
-
-    // Composite the working image into the icon bitmap, centered.
-    targetRect.origin.x = ((float)iconWidth - newSize.width ) / 2.0;
-    targetRect.origin.y = ((float)iconWidth - newSize.height) / 2.0;
-    targetRect.size.width = newSize.width;
-    targetRect.size.height = newSize.height;
-    [workingImageRep drawInRect:targetRect];
-
-    // Restore previous graphics context settings.
-    [graphicsContext setShouldAntialias:wasAntialiasing];
-    [graphicsContext setImageInterpolation:previousImageInterpolation];
-
-    [newImage unlockFocus];
-
-    [workingImage release];
-
-    // Return the new image!
-    return [newImage autorelease];
-}
-
-+ (Handle) get32BitDataFromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep requiredPixelSize:(int)requiredPixelSize
-{
-    Handle hRawData;
-    unsigned char* pRawData;
-    Size rawDataSize;
-    unsigned char* pSrc;
-    unsigned char* pDest;
-    int x, y;
-    unsigned char alphaByte;
-    float oneOverAlpha;
-
-    // Get information about the bitmapImageRep.
-    int pixelsWide      = [bitmapImageRep pixelsWide];
-    int pixelsHigh      = [bitmapImageRep pixelsHigh];
-    int bitsPerSample   = [bitmapImageRep bitsPerSample];
-    int samplesPerPixel = [bitmapImageRep samplesPerPixel];
-    int bitsPerPixel    = [bitmapImageRep bitsPerPixel];
-    BOOL isPlanar       = [bitmapImageRep isPlanar];
-    int bytesPerRow     = [bitmapImageRep bytesPerRow];
-    unsigned char* bitmapData = [bitmapImageRep bitmapData];
-
-    // Make sure bitmap has the required dimensions.
-    if (pixelsWide != requiredPixelSize || pixelsHigh != requiredPixelSize)
-	return NULL;
-
-    // So far, this code only handles non-planar 32-bit RGBA and 24-bit RGB source bitmaps.
-    // This could be made more flexible with some additional programming to accommodate other possible
-    // formats...
-    if (isPlanar)
-	{
-		NSLog(@"get32BitDataFromBitmapImageRep:requiredPixelSize: returning NULL due to isPlanar == YES");
-		return NULL;
-	}
-    if (bitsPerSample != 8)
-	{
-		NSLog(@"get32BitDataFromBitmapImageRep:requiredPixelSize: returning NULL due to bitsPerSample == %d", bitsPerSample);
-		return NULL;
-	}
-
-	if (((samplesPerPixel == 3) && (bitsPerPixel == 24)) || ((samplesPerPixel == 4) && (bitsPerPixel == 32)))
-	{
-		rawDataSize = pixelsWide * pixelsHigh * 4;
-		hRawData = NewHandle( rawDataSize );
-		if (hRawData == NULL)
-			return NULL;
-		pRawData = (unsigned char*) *hRawData;
-
-		pSrc = bitmapData;
-		pDest = pRawData;
-
-		if (bitsPerPixel == 32) {
-			for (y = 0; y < pixelsHigh; y++) {
-				pSrc = bitmapData + y * bytesPerRow;
-					for (x = 0; x < pixelsWide; x++) {
-						// Each pixel is 3 bytes of RGB data, followed by 1 byte of
-						// alpha.  The RGB values are premultiplied by the alpha (so
-						// that Quartz can save time when compositing the bitmap to a
-						// destination), and we undo this premultiplication (with some
-						// lossiness unfortunately) when retrieving the bitmap data.
-						*pDest++ = alphaByte = *(pSrc+3);
-						if (alphaByte) {
-							oneOverAlpha = 255.0f / (float)alphaByte;
-							*pDest++ = *(pSrc+0) * oneOverAlpha;
-							*pDest++ = *(pSrc+1) * oneOverAlpha;
-							*pDest++ = *(pSrc+2) * oneOverAlpha;
-						} else {
-							*pDest++ = 0;
-							*pDest++ = 0;
-							*pDest++ = 0;
-						}
-						pSrc+=4;
-				}
-			}
-		} else if (bitsPerPixel == 24) {
-			for (y = 0; y < pixelsHigh; y++) {
-				pSrc = bitmapData + y * bytesPerRow;
-				for (x = 0; x < pixelsWide; x++) {
-					*pDest++ = 0xFF;
-					*pDest++ = *pSrc++;
-					*pDest++ = *pSrc++;
-					*pDest++ = *pSrc++;
-				}
-			}
-		}
-	}
-	else
-	{
-		NSLog(@"get32BitDataFromBitmapImageRep:requiredPixelSize: returning NULL due to samplesPerPixel == %d, bitsPerPixel == %", samplesPerPixel, bitsPerPixel);
-		return NULL;
-	}
-
-    return hRawData;
-}
-
-+ (Handle) get8BitDataFromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep requiredPixelSize:(int)requiredPixelSize
-{
-    Handle hRawData;
-    unsigned char* pRawData;
-    Size rawDataSize;
-    unsigned char* pSrc;
-    unsigned char* pDest;
-    int x, y;
-
-    // Get information about the bitmapImageRep.
-    int pixelsWide      = [bitmapImageRep pixelsWide];
-    int pixelsHigh      = [bitmapImageRep pixelsHigh];
-    int bitsPerSample   = [bitmapImageRep bitsPerSample];
-    int samplesPerPixel = [bitmapImageRep samplesPerPixel];
-    int bitsPerPixel    = [bitmapImageRep bitsPerPixel];
-    BOOL isPlanar       = [bitmapImageRep isPlanar];
-    int bytesPerRow     = [bitmapImageRep bytesPerRow];
-    unsigned char* bitmapData = [bitmapImageRep bitmapData];
-
-    // Make sure bitmap has the required dimensions.
-    if (pixelsWide != requiredPixelSize || pixelsHigh != requiredPixelSize)
-        return NULL;
-
-    // So far, this code only handles non-planar 32-bit RGBA and 24-bit RGB source bitmaps.
-    // This could be made more flexible with some additional programming...
-    if (isPlanar)
-	{
-		NSLog(@"get8BitDataFromBitmapImageRep:requiredPixelSize: returning NULL due to isPlanar == YES");
-		return NULL;
-	}
-    if (bitsPerSample != 8)
-	{
-		NSLog(@"get8BitDataFromBitmapImageRep:requiredPixelSize: returning NULL due to bitsPerSample == %d", bitsPerSample);
-		return NULL;
-	}
-
-	if (((samplesPerPixel == 3) && (bitsPerPixel == 24)) || ((samplesPerPixel == 4) && (bitsPerPixel == 32)))
-	{
-		CGDirectPaletteRef cgPal;
-		CGDeviceColor cgCol;
-
-		rawDataSize = pixelsWide * pixelsHigh;
-		hRawData = NewHandle( rawDataSize );
-		if (hRawData == NULL)
-			return NULL;
-		pRawData = (unsigned char*) *hRawData;
-
-		cgPal = CGPaletteCreateDefaultColorPalette();
-
-		pSrc = bitmapData;
-		pDest = pRawData;
-		if (bitsPerPixel == 32) {
-			for (y = 0; y < pixelsHigh; y++) {
-				pSrc = bitmapData + y * bytesPerRow;
-				for (x = 0; x < pixelsWide; x++) {
-					cgCol.red = ((float)*(pSrc)) / 255;
-					cgCol.green = ((float)*(pSrc+1)) / 255;
-					cgCol.blue = ((float)*(pSrc+2)) / 255;
-
-					*pDest++ = CGPaletteGetIndexForColor(cgPal, cgCol);
-
-					pSrc+=4;
-				}
-			}
-		} else if (bitsPerPixel == 24) {
-			for (y = 0; y < pixelsHigh; y++) {
-				pSrc = bitmapData + y * bytesPerRow;
-				for (x = 0; x < pixelsWide; x++) {
-					cgCol.red = ((float)*(pSrc)) / 255;
-					cgCol.green = ((float)*(pSrc+1)) / 255;
-					cgCol.blue = ((float)*(pSrc+2)) / 255;
-
-					*pDest++ = CGPaletteGetIndexForColor(cgPal, cgCol);
-
-					pSrc+=3;
-				}
-			}
-		}
-
-		CGPaletteRelease(cgPal);
-	}
-	else
-	{
-		NSLog(@"get8BitDataFromBitmapImageRep:requiredPixelSize: returning NULL due to samplesPerPixel == %d, bitsPerPixel == %", samplesPerPixel, bitsPerPixel);
-		return NULL;
-	}
-
-    return hRawData;
-}
-
-+ (Handle) get8BitMaskFromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep requiredPixelSize:(int)requiredPixelSize
-{
-    Handle hRawData;
-    unsigned char* pRawData;
-    Size rawDataSize;
-    unsigned char* pSrc;
-    unsigned char* pDest;
-    int x, y;
-
-    // Get information about the bitmapImageRep.
-    int pixelsWide      = [bitmapImageRep pixelsWide];
-    int pixelsHigh      = [bitmapImageRep pixelsHigh];
-    int bitsPerSample   = [bitmapImageRep bitsPerSample];
-    int samplesPerPixel = [bitmapImageRep samplesPerPixel];
-    int bitsPerPixel    = [bitmapImageRep bitsPerPixel];
-    BOOL isPlanar       = [bitmapImageRep isPlanar];
-    int bytesPerRow     = [bitmapImageRep bytesPerRow];
-    unsigned char* bitmapData = [bitmapImageRep bitmapData];
-
-    // Make sure bitmap has the required dimensions.
-    if (pixelsWide != requiredPixelSize || pixelsHigh != requiredPixelSize)
-		return NULL;
-
-    // So far, this code only handles non-planar 32-bit RGBA, 24-bit RGB and 8-bit grayscale source bitmaps.
-    // This could be made more flexible with some additional programming...
-    if (isPlanar)
-	{
-		NSLog(@"get8BitMaskFromBitmapImageRep:requiredPixelSize: returning NULL due to isPlanar == YES");
-		return NULL;
-	}
-    if (bitsPerSample != 8)
-	{
-		NSLog(@"get8BitMaskFromBitmapImageRep:requiredPixelSize: returning NULL due to bitsPerSample == %d", bitsPerSample);
-		return NULL;
-	}
-
-	if (((samplesPerPixel == 1) && (bitsPerPixel == 8)) || ((samplesPerPixel == 3) && (bitsPerPixel == 24)) || ((samplesPerPixel == 4) && (bitsPerPixel == 32)))
-	{
-		rawDataSize = pixelsWide * pixelsHigh;
-		hRawData = NewHandle( rawDataSize );
-		if (hRawData == NULL)
-			return NULL;
-		pRawData = (unsigned char*) *hRawData;
-
-		pSrc = bitmapData;
-		pDest = pRawData;
-
-		if (bitsPerPixel == 32) {
-			for (y = 0; y < pixelsHigh; y++) {
-				pSrc = bitmapData + y * bytesPerRow;
-				for (x = 0; x < pixelsWide; x++) {
-					pSrc += 3;
-					*pDest++ = *pSrc++;
-				}
-			}
-		}
-		else if (bitsPerPixel == 24) {
-			memset( pDest, 255, rawDataSize );
-		}
-		else if (bitsPerPixel == 8) {
-			for (y = 0; y < pixelsHigh; y++) {
-				memcpy( pDest, pSrc, pixelsWide );
-				pSrc += bytesPerRow;
-				pDest += pixelsWide;
-			}
-		}
-	}
-	else
-	{
-		NSLog(@"get8BitMaskFromBitmapImageRep:requiredPixelSize: returning NULL due to samplesPerPixel == %d, bitsPerPixel == %", samplesPerPixel, bitsPerPixel);
-		return NULL;
-	}
-
-    return hRawData;
-}
-
-// NOTE: This method hasn't been fully tested yet.
-+ (Handle) get1BitMaskFromBitmapImageRep:(NSBitmapImageRep*)bitmapImageRep requiredPixelSize:(int)requiredPixelSize
-{
-    Handle hRawData;
-    unsigned char* pRawData;
-    Size rawDataSize;
-    unsigned char* pSrc;
-    unsigned char* pDest;
-    int x, y;
-    unsigned char maskByte;
-
-    // Get information about the bitmapImageRep.
-    int pixelsWide      = [bitmapImageRep pixelsWide];
-    int pixelsHigh      = [bitmapImageRep pixelsHigh];
-    int bitsPerSample   = [bitmapImageRep bitsPerSample];
-    int samplesPerPixel = [bitmapImageRep samplesPerPixel];
-    int bitsPerPixel    = [bitmapImageRep bitsPerPixel];
-    BOOL isPlanar       = [bitmapImageRep isPlanar];
-    int bytesPerRow     = [bitmapImageRep bytesPerRow];
-    unsigned char* bitmapData = [bitmapImageRep bitmapData];
-
-    // Make sure bitmap has the required dimensions.
-    if (pixelsWide != requiredPixelSize || pixelsHigh != requiredPixelSize)
-		return NULL;
-
-    // So far, this code only handles non-planar 32-bit RGBA, 24-bit RGB, 8-bit grayscale, and 1-bit source bitmaps.
-    // This could be made more flexible with some additional programming...
-    if (isPlanar)
-	{
-		NSLog(@"get1BitMaskFromBitmapImageRep:requiredPixelSize: returning NULL due to isPlanar == YES");
-		return NULL;
-	}
-
-	if (((bitsPerPixel == 1) && (samplesPerPixel == 1) && (bitsPerSample == 1)) || ((bitsPerPixel == 8) && (samplesPerPixel == 1) && (bitsPerSample == 8)) ||
-		((bitsPerPixel == 24) && (samplesPerPixel == 3) && (bitsPerSample == 8)) || ((bitsPerPixel == 32) && (samplesPerPixel == 4) && (bitsPerSample == 8)))
-	{
-		rawDataSize = (pixelsWide * pixelsHigh)/4;
-		hRawData = NewHandle( rawDataSize );
-		if (hRawData == NULL)
-			return NULL;
-		pRawData = (unsigned char*) *hRawData;
-
-		pSrc = bitmapData;
-		pDest = pRawData;
-
-		if (bitsPerPixel == 32) {
-			for (y = 0; y < pixelsHigh; y++) {
-				pSrc = bitmapData + y * bytesPerRow;
-				for (x = 0; x < pixelsWide; x += 8) {
-					maskByte = 0;
-					maskByte |= (*(unsigned*)pSrc & 0xff) ? 0x80 : 0; pSrc += 4;
-					maskByte |= (*(unsigned*)pSrc & 0xff) ? 0x40 : 0; pSrc += 4;
-					maskByte |= (*(unsigned*)pSrc & 0xff) ? 0x20 : 0; pSrc += 4;
-					maskByte |= (*(unsigned*)pSrc & 0xff) ? 0x10 : 0; pSrc += 4;
-					maskByte |= (*(unsigned*)pSrc & 0xff) ? 0x08 : 0; pSrc += 4;
-					maskByte |= (*(unsigned*)pSrc & 0xff) ? 0x04 : 0; pSrc += 4;
-					maskByte |= (*(unsigned*)pSrc & 0xff) ? 0x02 : 0; pSrc += 4;
-					maskByte |= (*(unsigned*)pSrc & 0xff) ? 0x01 : 0; pSrc += 4;
-					*pDest++ = maskByte;
-				}
-			}
-		}
-		else if (bitsPerPixel == 24) {
-			memset( pDest, 255, rawDataSize );
-		}
-		else if (bitsPerPixel == 8) {
-			for (y = 0; y < pixelsHigh; y++) {
-				pSrc = bitmapData + y * bytesPerRow;
-				for (x = 0; x < pixelsWide; x += 8) {
-					maskByte = 0;
-					maskByte |= *pSrc++ ? 0x80 : 0;
-					maskByte |= *pSrc++ ? 0x40 : 0;
-					maskByte |= *pSrc++ ? 0x20 : 0;
-					maskByte |= *pSrc++ ? 0x10 : 0;
-					maskByte |= *pSrc++ ? 0x08 : 0;
-					maskByte |= *pSrc++ ? 0x04 : 0;
-					maskByte |= *pSrc++ ? 0x02 : 0;
-					maskByte |= *pSrc++ ? 0x01 : 0;
-					*pDest++ = maskByte;
-				}
-			}
-		}
-		else if (bitsPerPixel == 1) {
-			for (y = 0; y < pixelsHigh; y++) {
-				memcpy( pDest, pSrc, pixelsWide / 8 );
-				pDest += pixelsWide / 8;
-				pSrc += bytesPerRow;
-			}
-		}
-
-		memcpy( pRawData+(pixelsWide*pixelsHigh)/8, pRawData, (pixelsWide*pixelsHigh)/8 );
-	}
-	else
-	{
-		NSLog(@"get1BitMaskFromBitmapImageRep:requiredPixelSize: returning NULL due to bitsPerPixel == %d, samplesPerPixel== %d, bitsPerSample == %d", bitsPerPixel, samplesPerPixel, bitsPerSample);
-		return NULL;
-	}
-
-    return hRawData;
-}
-
-- (BOOL) addResourceType:(OSType)type asResID:(int)resID
-{
-    Handle hIconRes = NewHandle(0);
-    OSErr err;
-
-    err = GetIconFamilyData( hIconFamily, type, hIconRes );
-
-    if( !GetHandleSize(hIconRes) || err != noErr )
-        return NO;
-
-    AddResource( hIconRes, type, resID, "\p" );
-
-    return YES;
-}
-
-@end
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= 1050  // Scrap Manager has been nixed on Snow Leopard
-// Methods for interfacing with the Carbon Scrap Manager (analogous to and
-// interoperable with the Cocoa Pasteboard).
-
-@implementation IconFamily (ScrapAdditions)
-
-+ (BOOL) canInitWithScrap
-{
-    ScrapRef scrap = NULL;
-    ScrapFlavorInfo* scrapInfos = NULL;
-    UInt32 numInfos = 0;
-    int i = 0;
-    BOOL canInit = NO;
-
-    GetCurrentScrap(&scrap);
-
-    GetScrapFlavorCount(scrap,&numInfos);
-    scrapInfos = malloc( sizeof(ScrapFlavorInfo)*numInfos );
-    if (scrapInfos) {
-      GetScrapFlavorInfoList(scrap, &numInfos, scrapInfos);
-
-      for( i=0; i<numInfos; i++ )
-      {
-          if( scrapInfos[i].flavorType == 'icns' )
-              canInit = YES;
-      }
-
-      free( scrapInfos );
-    }
-
-    return canInit;
-}
-
-+ (IconFamily*) iconFamilyWithScrap
-{
-    return [[[IconFamily alloc] initWithScrap] autorelease];
-}
-
-- initWithScrap
-{
-    Handle storageMem = NULL;
-    Size amountMem = 0;
-    ScrapRef scrap;
-
-    self = [super init];
-
-    if( self )
-    {
-        GetCurrentScrap(&scrap);
-
-        GetScrapFlavorSize( scrap, 'icns', &amountMem );
-
-        storageMem = NewHandle(amountMem);
-
-        GetScrapFlavorData( scrap, 'icns', &amountMem, *storageMem );
-
-        hIconFamily = (IconFamilyHandle)storageMem;
-    }
-    return self;
-}
-
-- (BOOL) putOnScrap
-{
-    ScrapRef scrap = NULL;
-
-    ClearCurrentScrap();
-    GetCurrentScrap(&scrap);
-
-//    HLock((Handle)hIconFamily); // Handle-based memory isn't compacted anymore, so calling HLock()/HUnlock() is unnecessary.
-    PutScrapFlavor( scrap, 'icns', kScrapFlavorMaskNone, GetHandleSize((Handle)hIconFamily), *hIconFamily);
-//    HUnlock((Handle)hIconFamily); // Handle-based memory isn't compacted anymore, so calling HLock()/HUnlock() is unnecessary.
-    return YES;
-}
-
-@end
-
-#endif
diff --git a/src/MacVim/icons/makeicns/Makefile b/src/MacVim/icons/makeicns/Makefile
deleted file mode 100644
index cd8ef969cb..0000000000
--- a/src/MacVim/icons/makeicns/Makefile
+++ /dev/null
@@ -1,16 +0,0 @@
-CFLAGS = -fpascal-strings -O2
-
-.PHONY: clean dist
-
-makeicns: makeicns.o IconFamily.o NSString+CarbonFSRefCreation.o
-	g++ -o makeicns $^ -O2 \
-	  -framework Foundation -framework AppKit -framework Carbon
-
-clean:
-	rm -rf makeicns.o IconFamily.o NSString+CarbonFSRefCreation.o
-
-dist: makeicns
-	rm -rf makeicns-1.0.zip
-	zip makeicns-1.0.zip Makefile makeicns.m IconFamily.m IconFamily.h \
-	  NSString+CarbonFSRefCreation.m NSString+CarbonFSRefCreation.h \
-	  makeicns
diff --git a/src/MacVim/icons/makeicns/NSString+CarbonFSRefCreation.h b/src/MacVim/icons/makeicns/NSString+CarbonFSRefCreation.h
deleted file mode 100644
index e965c613ab..0000000000
--- a/src/MacVim/icons/makeicns/NSString+CarbonFSRefCreation.h
+++ /dev/null
@@ -1,25 +0,0 @@
-/*
-    Copyright (c) 2001-2006 Troy N. Stephens
-
-    Use and distribution of this source code is governed by the MIT License, whose terms are as follows.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#import <Foundation/Foundation.h>
-#import <Carbon/Carbon.h>
-
-@interface NSString (CarbonFSRefCreation)
-
-// Fills in the given FSRef struct so it specifies the file whose path is in this string.
-// If the file doesn't exist, and "createFile" is YES, this method will attempt to create
-// an empty file with the specified path.  (The caller should insure that the directory
-// the file is to be placed in already exists.)
-
-- (BOOL) getFSRef:(FSRef*)fsRef createFileIfNecessary:(BOOL)createFile;
-
-@end
diff --git a/src/MacVim/icons/makeicns/NSString+CarbonFSRefCreation.m b/src/MacVim/icons/makeicns/NSString+CarbonFSRefCreation.m
deleted file mode 100644
index 7e6a0f4588..0000000000
--- a/src/MacVim/icons/makeicns/NSString+CarbonFSRefCreation.m
+++ /dev/null
@@ -1,58 +0,0 @@
-/*
-    Copyright (c) 2001-2006 Troy N. Stephens
-
-    Use and distribution of this source code is governed by the MIT License, whose terms are as follows.
-
-    Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-    The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-    THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-*/
-
-#import "NSString+CarbonFSRefCreation.h"
-
-@implementation NSString (CarbonFSRefCreation)
-
-- (BOOL) getFSRef:(FSRef*)fsRef createFileIfNecessary:(BOOL)createFile
-{
-    NSFileManager* fileManager = [NSFileManager defaultManager];
-    CFURLRef urlRef;
-    Boolean gotFSRef;
-
-    // Check whether the file exists already.  If not, create an empty file if requested.
-    if (![fileManager fileExistsAtPath:self]) {
-        if (createFile) {
-            if (![@"" writeToFile:self atomically:YES]) {
-                return NO;
-            }
-        } else {
-            return NO;
-        }
-    }
-
-    // Create a CFURL with the specified POSIX path.
-    urlRef = CFURLCreateWithFileSystemPath( kCFAllocatorDefault,
-                                            (CFStringRef) self,
-                                            kCFURLPOSIXPathStyle,
-                                            FALSE /* isDirectory */ );
-    if (urlRef == NULL) {
-//        printf( "** Couldn't make a CFURLRef for the file.\n" );
-        return NO;
-    }
-
-    // Try to create an FSRef from the URL.  (If the specified file doesn't exist, this
-    // function will return false, but if we've reached this code we've already insured
-    // that the file exists.)
-    gotFSRef = CFURLGetFSRef( urlRef, fsRef );
-    CFRelease( urlRef );
-
-    if (!gotFSRef) {
-//        printf( "** Couldn't get an FSRef for the file.\n" );
-        return NO;
-    }
-
-    return YES;
-}
-
-@end
diff --git a/src/MacVim/icons/makeicns/makeicns.m b/src/MacVim/icons/makeicns/makeicns.m
deleted file mode 100644
index cfc2c26fa6..0000000000
--- a/src/MacVim/icons/makeicns/makeicns.m
+++ /dev/null
@@ -1,173 +0,0 @@
-// makeicns
-// Converts images to Apple's icns format.
-// Written by nicolasweber@gmx.de, released under MIT license.
-
-#import <Foundation/Foundation.h>
-#import <AppKit/AppKit.h>
-
-#import <Cocoa/Cocoa.h>
-
-#include "IconFamily.h"
-
-#if MAC_OS_X_VERSION_MAX_ALLOWED <= MAC_OS_X_VERSION_10_4
-// This is defined in 10.5 and beyond in IconStorage.h
-enum {
-  kIconServices512PixelDataARGB = 'ic09' /* non-premultiplied 512x512 ARGB bitmap*/
-};
-#endif
-
-#define VERSION "1.0 (20081122)"
-
-void usage() {
-  fprintf(stderr,
-"makeicns v%s\n\n", VERSION);
-  fprintf(stderr,
-"Usage: makeicns [k1=v1] [k2=v2] ...\n\n");
-  fprintf(stderr,
-"Keys and values include:\n");
-  fprintf(stderr,
-"    512: Name of input image for 512x512 variant of icon\n");
-  fprintf(stderr,
-"    256: Name of input image for 256x256 variant of icon\n");
-  fprintf(stderr,
-"    128: Name of input image for 128x128 variant of icon\n");
-  fprintf(stderr,
-"     32: Name of input image for 32x32 variant of icon\n");
-  fprintf(stderr,
-"     16: Name of input image for 16x16 variant of icon\n");
-  fprintf(stderr,
-"     in: Name of input image for all variants not having an explicit name\n");
-  fprintf(stderr,
-"    out: Name of output file, defaults to first nonempty input name,\n"
-"         but with icns extension\n\n");
-  fprintf(stderr,
-"Examples:\n\n"
-"  icns -512 image.png -32 image.png\n"
-"      Creates image.icns with only a 512x512 and a 32x32 variant.\n\n"
-"  icns -in myfile.jpg -32 otherfile.png -out outfile.icns\n"
-"      Creates outfile.icns with sizes 512, 256, 128, and 16 containing data\n"
-"      from myfile.jpg and with size 32 containing data from otherfile.png.\n");
-  exit(1);
-}
-
-
-NSBitmapImageRep* getBitmapImageRepOfSize(NSImage* img, int size) {
-
-  // Don't resample if it's not necessary
-#if 0
-  // IconFamily does not work correctly with
-  // NSAlphaNonpremultipliedBitmapFormat images, so this has to stay disabled
-  // until IconFamily is fixed (if ever).
-  NSEnumerator* e = [[img representations] objectEnumerator];
-  NSImageRep* ir;
-  while ((ir = [e nextObject])) {
-    if (![ir isKindOfClass:[NSBitmapImageRep class]]) continue;
-
-    NSBitmapImageRep* br = (NSBitmapImageRep*)ir;
-    //NSLog(@"%@", br);
-    if ([br pixelsWide] == size && [br pixelsHigh] == size
-        && ([[br colorSpaceName] isEqualToString:NSDeviceRGBColorSpace]
-          || [[br colorSpaceName] isEqualToString:NSCalibratedRGBColorSpace])
-        && ([br bitsPerPixel] == 24 || [br bitsPerPixel] == 32)
-       )
-      return br;
-  }
-#endif
-
-  NSLog(@"Resampling for size %d", size);
-  NSBitmapImageRep* r = [[NSBitmapImageRep alloc]
-    initWithBitmapDataPlanes:NULL
-                       pixelsWide:size
-                       pixelsHigh:size
-                    bitsPerSample:8
-                  samplesPerPixel:4
-                         hasAlpha:YES
-                         isPlanar:NO
-                   colorSpaceName:NSDeviceRGBColorSpace
-                     bitmapFormat:0
-                      bytesPerRow:0
-                     bitsPerPixel:0];
-
-  [NSGraphicsContext saveGraphicsState];
-  NSGraphicsContext* context = [NSGraphicsContext
-    graphicsContextWithBitmapImageRep:r];
-  [context setShouldAntialias:YES];
-  [context setImageInterpolation:NSImageInterpolationHigh];
-  [NSGraphicsContext setCurrentContext:context];
-
-  [img drawInRect:NSMakeRect(0, 0, size, size)
-         fromRect:NSZeroRect
-        operation:NSCompositeCopy
-         fraction:1.0];
-
-  [NSGraphicsContext restoreGraphicsState];
-
-  return r;
-}
-
-
-int main(int argc, char* argv[]) {
-  int i;
-
-  NSAutoreleasePool * pool = [[NSAutoreleasePool alloc] init];
-  NSApplicationLoad();
-
-  struct {
-    NSString* paramName;
-    OSType type, mask;
-    int size;
-    NSString* inputName;
-  } inputs[] = {
-    { @"512", kIconServices512PixelDataARGB, 0, 512, nil },
-    { @"256", kIconServices256PixelDataARGB, 0, 256, nil },
-    { @"128", kThumbnail32BitData, kThumbnail8BitMask, 128, nil },
-    { @"32", kLarge32BitData, kLarge8BitMask, 32, nil },
-    { @"16", kSmall32BitData, kSmall8BitMask, 16, nil },
-  };
-  const int N = sizeof(inputs)/sizeof(inputs[0]);
-
-  // Process arguments -- Thanks Greg!
-  //http://unixjunkie.blogspot.com/2006/07/command-line-processing-in-cocoa.html
-  NSUserDefaults* args = [NSUserDefaults standardUserDefaults];
-
-  BOOL foundInputParam = NO;
-  NSString* outputName = [args stringForKey:@"out"];
-  NSString* defaultIn = [args stringForKey:@"in"];
-  for (i = 0; i < N; ++i) {
-    inputs[i].inputName = [args stringForKey:inputs[i].paramName];
-    if (inputs[i].inputName == nil)
-      inputs[i].inputName = defaultIn;
-    foundInputParam = foundInputParam || inputs[i].inputName != nil;
-
-    // Create default output name if necessary
-    if (outputName == nil && inputs[i].inputName != nil)
-      outputName = [[inputs[i].inputName stringByDeletingPathExtension]
-          stringByAppendingPathExtension:@"icns"];
-  }
-
-  if (!foundInputParam)
-    usage();
-
-  // Create output
-  IconFamily* output = [IconFamily iconFamily];
-
-  for (i = 0; i < N; ++i) {
-    if (inputs[i].inputName == nil) continue;
-    NSImage* img = [[[NSImage alloc] initWithContentsOfFile:inputs[i].inputName]
-      autorelease];
-
-    NSBitmapImageRep* rep = getBitmapImageRepOfSize(img, inputs[i].size);
-    [output setIconFamilyElement:inputs[i].type fromBitmapImageRep:rep];
-    if (inputs[i].mask != 0)
-      [output setIconFamilyElement:inputs[i].mask fromBitmapImageRep:rep];
-  }
-
-  // Write output
-  if ([output writeToFile:outputName])
-    NSLog(@"Wrote output file \"%@\"", outputName);
-  else
-    NSLog(@"Failed to write \"%@\"", outputName);
-
-  [pool drain];
-  return 0;
-}
diff --git a/src/MacVim/icons/setup.py b/src/MacVim/icons/setup.py
deleted file mode 100644
index 3afc2ed60a..0000000000
--- a/src/MacVim/icons/setup.py
+++ /dev/null
@@ -1,5 +0,0 @@
-from distutils.core import setup, Extension
-
-setup(name="loadfont", version="1.0",
-	ext_modules = [Extension("loadfont", ["loadfont.c"])])
-
diff --git a/src/MacVim/icons/vim-noshadow-512.png b/src/MacVim/icons/vim-noshadow-512.png
deleted file mode 100644
index 0eefe3b242..0000000000
Binary files a/src/MacVim/icons/vim-noshadow-512.png and /dev/null differ