diff --git a/res/jsoninspector.desktop b/res/jsoninspector.desktop
index 2b6e906..1ec3688 100644
--- a/res/jsoninspector.desktop
+++ b/res/jsoninspector.desktop
@@ -1,11 +1,9 @@
 [Desktop Entry]
-Encoding=UTF-8
-Version=2.0                                     
-Name[en_US]=JSON Inspector
+Name=JSON Inspector
 GenericName=JSON Inspector
 Exec=jsoninspector.py
 Terminal=false                                  
-Icon[en_US]=/usr/local/share/jsoninspector/
+Icon=/usr/local/share/jsoninspector/
 Type=Application                                
-Categories=Application;Programming
-Comment[en_US]=JSON Inspector              
+Categories=Application;Programming;
+Comment=JSON Inspector              
diff --git a/res/jsoninspector.glade b/res/jsoninspector.glade
index 57b7344..5c56bde 100644
--- a/res/jsoninspector.glade
+++ b/res/jsoninspector.glade
@@ -9,7 +9,7 @@
     <property name="modal">True</property>
     <property name="window_position">center-on-parent</property>
     <property name="destroy_with_parent">True</property>
-    <property name="type_hint">dialog</property>
+    <property name="type_hint">normal</property>
     <property name="deletable">False</property>
     <property name="gravity">center</property>
     <property name="has_resize_grip">False</property>
@@ -53,6 +53,7 @@
     <property name="window_position">center</property>
     <property name="default_width">200</property>
     <property name="default_height">180</property>
+    <property name="icon_name">java-1.7.0</property>
     <signal name="delete-event" handler="onCopyJSONDelete" swapped="no"/>
     <signal name="destroy" handler="onCopyJSONDestroy" swapped="no"/>
     <child>
@@ -174,6 +175,7 @@
     <property name="can_focus">False</property>
     <property name="title" translatable="yes">JSON Inspector</property>
     <property name="window_position">center</property>
+    <property name="icon_name">java-1.7.0</property>
     <signal name="delete-event" handler="onMainWindowDelete" swapped="no"/>
     <child>
       <object class="GtkBox" id="box1">
diff --git a/setup.py b/setup.py
index 72ee9ec..ba49a27 100644
--- a/setup.py
+++ b/setup.py
@@ -39,6 +39,12 @@ class CustomInstall(install):
                 except:
                     print "Warning: error copying icon {size}.".format(icon_size)
 
+            try:
+                shutil.copyfile('res/jsoninspector48x48.png', '/usr/share/pixmaps/jsoninspector.png')
+
+            except:
+                print "Warning: error copying icon to pixmaps directory."
+
             try:
                 print "Installing glade file..."
                 shutil.copyfile('res/jsoninspector.glade', '/usr/local/share/jsoninspector/jsoninspector.desktop')