diff --git a/utils/themeeditor/editorwindow.ui b/utils/themeeditor/editorwindow.ui
index 24bd1b4325..f5064a0b47 100644
--- a/utils/themeeditor/editorwindow.ui
+++ b/utils/themeeditor/editorwindow.ui
@@ -11,20 +11,20 @@
    </rect>
   </property>
   <property name="windowTitle">
-   <string>MainWindow</string>
+   <string>Rockbox Theme Editor</string>
+  </property>
+  <property name="windowIcon">
+   <iconset resource="resources.qrc">
+    <normaloff>:/resources/resources/windowicon.png</normaloff>:/resources/resources/windowicon.png</iconset>
   </property>
   <widget class="QWidget" name="centralwidget">
-   <layout class="QHBoxLayout" name="horizontalLayout">
+   <layout class="QVBoxLayout" name="verticalLayout">
     <item>
-     <layout class="QVBoxLayout" name="verticalLayout">
-      <item>
-       <widget class="QPlainTextEdit" name="codeEdit">
-        <property name="lineWrapMode">
-         <enum>QPlainTextEdit::NoWrap</enum>
-        </property>
-       </widget>
-      </item>
-     </layout>
+     <widget class="QPlainTextEdit" name="codeEdit">
+      <property name="lineWrapMode">
+       <enum>QPlainTextEdit::NoWrap</enum>
+      </property>
+     </widget>
     </item>
    </layout>
   </widget>
@@ -39,7 +39,7 @@
    </property>
    <widget class="QMenu" name="menuFile">
     <property name="title">
-     <string>File</string>
+     <string>&amp;File</string>
     </property>
     <addaction name="actionPreferences"/>
     <addaction name="separator"/>
@@ -47,7 +47,7 @@
    </widget>
    <widget class="QMenu" name="menuView">
     <property name="title">
-     <string>View</string>
+     <string>&amp;View</string>
     </property>
     <addaction name="actionPreview_Panel"/>
     <addaction name="actionDisplay_Panel"/>
@@ -143,7 +143,7 @@
   </widget>
   <action name="actionQuit">
    <property name="text">
-    <string>Quit</string>
+    <string>&amp;Quit</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+Q</string>
@@ -157,7 +157,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Parse Tree Panel</string>
+    <string>Parse &amp;Tree Panel</string>
    </property>
    <property name="shortcut">
     <string>Ctrl+D</string>
@@ -165,7 +165,7 @@
   </action>
   <action name="actionPreferences">
    <property name="text">
-    <string>Preferences</string>
+    <string>&amp;Preferences</string>
    </property>
   </action>
   <action name="actionFile_Panel">
@@ -176,7 +176,7 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>File Panel</string>
+    <string>&amp;File Panel</string>
    </property>
   </action>
   <action name="actionPreview_Panel">
@@ -187,11 +187,13 @@
     <bool>true</bool>
    </property>
    <property name="text">
-    <string>Preview Panel</string>
+    <string>&amp;Preview Panel</string>
    </property>
   </action>
  </widget>
- <resources/>
+ <resources>
+  <include location="resources.qrc"/>
+ </resources>
  <connections>
   <connection>
    <sender>actionQuit</sender>
diff --git a/utils/themeeditor/resources.qrc b/utils/themeeditor/resources.qrc
new file mode 100644
index 0000000000..fbe5cfbb01
--- /dev/null
+++ b/utils/themeeditor/resources.qrc
@@ -0,0 +1,5 @@
+<RCC>
+    <qresource prefix="/resources">
+        <file>resources/windowicon.png</file>
+    </qresource>
+</RCC>
diff --git a/utils/themeeditor/resources/appicon.xcf b/utils/themeeditor/resources/appicon.xcf
new file mode 100644
index 0000000000..3d9ed4843d
Binary files /dev/null and b/utils/themeeditor/resources/appicon.xcf differ
diff --git a/utils/themeeditor/resources/windowicon.png b/utils/themeeditor/resources/windowicon.png
new file mode 100644
index 0000000000..681dfebe78
Binary files /dev/null and b/utils/themeeditor/resources/windowicon.png differ
diff --git a/utils/themeeditor/themeeditor.pro b/utils/themeeditor/themeeditor.pro
index ede17109b5..15615004b1 100644
--- a/utils/themeeditor/themeeditor.pro
+++ b/utils/themeeditor/themeeditor.pro
@@ -22,5 +22,8 @@ SOURCES += tag_table.c \
     parsetreenode.cpp \
     editorwindow.cpp \
     skinhighlighter.cpp
-OTHER_FILES += README
+OTHER_FILES += README \
+    resources/windowicon.png \
+    resources/appicon.xcf
 FORMS += editorwindow.ui
+RESOURCES += resources.qrc