24 files changed, 24 insertions, 24 deletions

diff --git a/apps/Applications/advancedfm.desktop b/apps/Applications/advancedfm.desktop
index 254e4b7..72b30f8 100644
--- a/apps/Applications/advancedfm.desktop
+++ b/apps/Applications/advancedfm.desktop
@@ -1,13 +1,13 @@
 [Desktop Entry]
 Comment = An advanced file manager program
 Exec = advancedfm
 File = advancedfm
-Icon = FileBrowser
+Icon = advancedfm/FileBrowser
 Name = AdvancedFM
 Type = Application
 Name[pt]=Gestor Ficheiros
 Name[es]=Gestor Ficheros
 Name[de]=Dateimanager
 Name[it]=Gestione File
 Name[zh_TW]=進階檔案總管
 Name[ko]=발달된 파일 관리자
diff --git a/apps/Applications/calculator.desktop b/apps/Applications/calculator.desktop
index d147212..052ef8f 100644
--- a/apps/Applications/calculator.desktop
+++ b/apps/Applications/calculator.desktop
@@ -1,16 +1,16 @@
 [Desktop Entry]
 Comment=A Calculator Program
 Exec=calculator
-Icon=Calculator
+Icon=calc/Calculator
 Type=Application
 Name=Calculator
 Name[pt_BR]=Calculadora
 Name[no]=Kalkulator
 Name[de]=Taschen rechner
 Name[ja]=電卓
 Name[hu]=Számológép
 Name[it]=Calcolatrice
 Name[pt]=Calculadora
 Name[es]=Calculadora
 Name[zh_TW]=計算機
 Name[ko]=계산기
diff --git a/apps/Applications/citytime.desktop b/apps/Applications/citytime.desktop
index f26c773..843181f 100644
--- a/apps/Applications/citytime.desktop
+++ b/apps/Applications/citytime.desktop
@@ -1,16 +1,16 @@
 [Desktop Entry]
 Comment=A World Clock and Time Zone Editor
 Exec=citytime
-Icon=CityTime
+Icon=citytime/CityTime
 Type=Application
 Name=City Time
 Name[pt_BR]=Hora Local
 Name[no]=Verdensur
 Name[de]=Weltzeituhr
 Name[ja]=世界時計
 Name[hu]=Idõzóna
 Name[it]=Fuso Orario
 Name[pt]=Fusos Horários
 Name[es]=Hora Mundial
 Name[zh_TW]=世界時間
 Name[ko]=세계시간
diff --git a/apps/Applications/filebrowser.desktop b/apps/Applications/filebrowser.desktop
index 9c05c41..55cdce0 100644
--- a/apps/Applications/filebrowser.desktop
+++ b/apps/Applications/filebrowser.desktop
@@ -1,16 +1,16 @@
 [Desktop Entry]
 Comment = A File Manager Program
 Exec = filebrowser
 File = ../apps/Applications/filebrowser
-Icon = FileBrowser
+Icon = filebrowser/FileBrowser
 Name = File Manager
 Name[pt_BR] = Gerenciador de Arquivos
 Name[de]=Datei Manager
 Name[no] = Filviser
 Type = Application
 Name[hu]=Intézõ
 Name[it]=Gestione File
 Name[pt]=Gestor Ficheiros
 Name[es]=Gestor Ficheros
 Name[zh_TW]=檔案總管
 Name[ko]=파일 관리자
diff --git a/apps/Applications/helpbrowser.desktop b/apps/Applications/helpbrowser.desktop
index efe57f4..8fb3564 100644
--- a/apps/Applications/helpbrowser.desktop
+++ b/apps/Applications/helpbrowser.desktop
@@ -1,15 +1,15 @@
 [Desktop Entry]
 Comment=A HTML Help Browser Program
 Exec=helpbrowser
-Icon=HelpBrowser
+Icon=helpbrowser/HelpBrowser
 Type=Application
 Name=Help Browser
 Name[pt_BR] = Navegador de Ajuda
 Name[no]=Hjelp
 Name[de]=Hilfe
 Name[hu]=Segítség
 Name[it]=Aiuto
 Name[pt]=Ajuda
 Name[es]=Ayuda
 Name[zh_TW]=求助
 Name[ko]=도움말 브라우져
diff --git a/apps/Applications/showimg.desktop b/apps/Applications/showimg.desktop
index 3289ffe..ace4a3d 100644
--- a/apps/Applications/showimg.desktop
+++ b/apps/Applications/showimg.desktop
@@ -1,15 +1,15 @@
 [Desktop Entry]
 Comment=An Image Viewer
 Exec=showimg
 MimeType=image/*
-Icon=ImageViewer
+Icon=imageviewer/ImageViewer
 Type=Application
 Name=Image Viewer
 Name[pt_BR]=Visualizador de Imagens
 Name[de]=Bildbetrachter
 Name[hu]=Nézõke
 Name[it]=Visualizzatore Immagini
 Name[pt]=Leitor Imagens
 Name[es]=Visor Imágenes
 Name[zh_TW]=圖檔檢視
 Name[ko]=이미지 뷰어
diff --git a/apps/Games/go.desktop b/apps/Games/go.desktop
index 157f8dd..ba77006 100644
--- a/apps/Games/go.desktop
+++ b/apps/Games/go.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Comment=A Board Strategy Game
 Exec=go
-Icon=Go
+Icon=go/Go
 Type=Application
 Name=Go
 Name[pt]=Go
 Name[es]=Go
 Name[de]=Go
 Name[it]=Go
 Name[zh_TW]=圍棋
 Name[ko]=바둑
diff --git a/apps/Games/mindbreaker.desktop b/apps/Games/mindbreaker.desktop
index 5e8c7af..487f110 100644
--- a/apps/Games/mindbreaker.desktop
+++ b/apps/Games/mindbreaker.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Comment=A Code Breaking Game
 Exec=mindbreaker
-Icon=Mindbreaker
+Icon=mindbreaker/Mindbreaker
 Type=Application
 Name=Mindbreaker
 Name[pt]=Mindbreaker
 Name[es]=Rompecabezas
 Name[it]=Rompicapo
 Name[de]=Mindbreaker
 Name[zh_TW]=智慧棋
 Name[ko]=마인드 브레이커
diff --git a/apps/Games/minesweep.desktop b/apps/Games/minesweep.desktop
index f323f0a..7825df5 100644
--- a/apps/Games/minesweep.desktop
+++ b/apps/Games/minesweep.desktop
@@ -1,16 +1,16 @@
 [Desktop Entry]
 Comment=Find the mines
 Exec=minesweep
-Icon=MineHunt
+Icon= minesweep/MineHunt
 Type=Application
 Name=Mine Hunt
 Name[pt_BR]=Caca-Minas
 Name[no]=Minesøk
 Name[de]=Minenjagd
 Name[ja]=マインスィープ
 Name[hu]=Aknakeresõ
 Name[it]=Campo Minato
 Name[pt]=Minas
 Name[es]=Busca Minas
 Name[zh_TW]=踩地雷
 Name[ko]=지뢰
diff --git a/apps/Games/patience.desktop b/apps/Games/patience.desktop
index 7600f00..9d26951 100644
--- a/apps/Games/patience.desktop
+++ b/apps/Games/patience.desktop
@@ -1,16 +1,16 @@
 [Desktop Entry]
 Comment=A Game of Patience
 Exec=patience
-Icon=Solitaire
+Icon=cards/Solitaire
 Type=Application
 Name=Patience
 Name[pt_BR]=Paciencia
 Name[no]=Kabal
 Name[de]=Patience
 Name[ja]=ソリティア
 Name[hu]=Passziánsz
 Name[it]=Solitario
 Name[pt]=Solitário
 Name[es]=Paciencia
 Name[zh_TW]=接龍
 Name[ko]=카드놀이
diff --git a/apps/Games/snake.desktop b/apps/Games/snake.desktop
index 5126f80..376c6a9 100644
--- a/apps/Games/snake.desktop
+++ b/apps/Games/snake.desktop
@@ -1,15 +1,15 @@
 [Desktop Entry]
 Comment=A Snake Game
 Exec=snake
-Icon=Snake
+Icon=snake/Snake
 Type=Application
 Name=Snake
 Name[pt_BR]=Cobra
 Name[no]=Slange
 Name[de]=Schlange
 Name[hu]=Kígyó
 Name[it]=Snake
 Name[pt]=Cobra
 Name[es]=Serpiente
 Name[zh_TW]=貪食蛇
 Name[ko]=스네이크
diff --git a/apps/Games/tetrix.desktop b/apps/Games/tetrix.desktop
index d0320d0..843e4ae 100644
--- a/apps/Games/tetrix.desktop
+++ b/apps/Games/tetrix.desktop
@@ -1,13 +1,13 @@
 [Desktop Entry]
 Comment=A Block Stacking Game
 Exec=tetrix
-Icon=Tetrix
+Icon=tetrix/Tetrix
 Type=Application
 Name=Tetrix
 Name[ja]=テトリックス
 Name[pt]=Tetris
 Name[es]=Tetrix
 Name[it]=Tetris
 Name[de]=Tetris
 Name[zh_TW]=俄羅斯方塊
 Name[ko]=테트릭스
diff --git a/apps/Games/wordgame.desktop b/apps/Games/wordgame.desktop
index 0200b20..5dce0ff 100644
--- a/apps/Games/wordgame.desktop
+++ b/apps/Games/wordgame.desktop
@@ -1,15 +1,15 @@
 [Desktop Entry]
 Comment=A word arranging game
 Exec=wordgame
-Icon=WordGame
+Icon=wordgame/WordGame
 Type=Application
 Name=Word Game
 Name[pt_BR]=Palavras Cruzadas
 Name[no]=Kryss-Ord
 Name[de]=Wortspiel
 Name[hu]=Szójáték
 Name[it]=Scarabeo
 Name[pt]=Palavras Cruzadas
 Name[es]=Crucigrama
 Name[zh_TW]=文字遊戲
 Name[ko]=글자 놀이
diff --git a/apps/Settings/Appearance.desktop b/apps/Settings/Appearance.desktop
index 00dec07..b6cb774 100644
--- a/apps/Settings/Appearance.desktop
+++ b/apps/Settings/Appearance.desktop
@@ -1,14 +1,14 @@
 [Desktop Entry]
 Type=Application
 Exec=appearance
-Icon=Appearance
+Icon=appearance/Appearance
 Name=Appearance
 Name[pt_BR]=Aparencia
 Name[no]=Utseende
 Name[de]=Erscheinungs bild
 Name[hu]=Megjelenés
 Name[it]=Aspetto
 Name[pt]=Aparência
 Name[es]=Apariencia
 Name[zh_TW]=外觀
 Name[ko]=테마
diff --git a/apps/Settings/Light.desktop b/apps/Settings/Light.desktop
index 4ebc4fd..91b4095 100644
--- a/apps/Settings/Light.desktop
+++ b/apps/Settings/Light.desktop
@@ -1,14 +1,14 @@
 [Desktop Entry]
 Type=Application
 Exec=light-and-power
-Icon=Light
+Icon=lightandpower/Light
 Name=Light & Power
 Name[pt_BR]=Iluminacao e Energia
 Name[no]=Lys
 Name[de]=Helligkeit
 Name[hu]=Fényerõ
 Name[it]=Risparmio Energetico
 Name[pt]=Iluminação e Energia
 Name[es]=Luz y Energía
 Name[zh_TW]=光暗設定
 Name[ko]=백라이트와 전기절약
diff --git a/apps/Settings/netsetup.desktop b/apps/Settings/netsetup.desktop
index dec27f4..2ef6320 100644
--- a/apps/Settings/netsetup.desktop
+++ b/apps/Settings/netsetup.desktop
@@ -1,12 +1,12 @@
 [Desktop Entry]
 Exec=netsetup
-Icon=PPPConnect
+Icon=Network/PPPConnect
 Type=Application
 Name=Network
 Name[pt_BR]=Rede
 Name[de]=Netzwerk
 Name[it]=PPP
 Name[pt]=Rede
 Name[es]=Red
 Name[zh_TW]=網絡
 Name[ko]=네트워크 설정
diff --git a/noncore/apps/advancedfm/opie-advancedfm.control b/noncore/apps/advancedfm/opie-advancedfm.control
index bda8543..fdfec5a 100644
--- a/noncore/apps/advancedfm/opie-advancedfm.control
+++ b/noncore/apps/advancedfm/opie-advancedfm.control
@@ -1,9 +1,9 @@
-Files: bin/advancedfm apps/Applications/advancedfm.desktop
+Files: bin/advancedfm apps/Applications/advancedfm.desktop pics/advancedfm
 Priority: optional
 Section: opie/applications
 Maintainer: L.J. Potter <ljp@llornkcor.com> 
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Advanced File Manager
  The advanced file manager for the Opie environment.
diff --git a/noncore/games/go/opie-go.control b/noncore/games/go/opie-go.control
index c3804d2..3003139 100644
--- a/noncore/games/go/opie-go.control
+++ b/noncore/games/go/opie-go.control
@@ -1,9 +1,9 @@
-Files: bin/go apps/Games/go.desktop
+Files: bin/go apps/Games/go.desktop pics/go
 Priority: optional
 Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: The game of Go
  A game for the Opie environment.
diff --git a/noncore/games/minesweep/opie-minesweep.control b/noncore/games/minesweep/opie-minesweep.control
index 4a79e99..d58790a 100644
--- a/noncore/games/minesweep/opie-minesweep.control
+++ b/noncore/games/minesweep/opie-minesweep.control
@@ -1,9 +1,9 @@
-Files: bin/minesweep apps/Games/minesweep.desktop
+Files: bin/minesweep apps/Games/minesweep.desktop pics/minesweep
 Priority: optional
 Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Game: find the mines
  A game for the Opie environment.
diff --git a/noncore/games/solitaire/opie-solitaire.control b/noncore/games/solitaire/opie-solitaire.control
index fe4cac9..e9c3cbd 100644
--- a/noncore/games/solitaire/opie-solitaire.control
+++ b/noncore/games/solitaire/opie-solitaire.control
@@ -1,9 +1,9 @@
-Files: bin/patience apps/Games/patience.desktop pics/cards
+Files: bin/patience apps/Games/patience.desktop pics/cards 
 Priority: optional
 Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Game: solitaire card games
  A solitaire game for the Opie environment.
diff --git a/noncore/games/tetrix/opie-tetrix.control b/noncore/games/tetrix/opie-tetrix.control
index 8670106..2c0e4e1 100644
--- a/noncore/games/tetrix/opie-tetrix.control
+++ b/noncore/games/tetrix/opie-tetrix.control
@@ -1,10 +1,10 @@
-Files: bin/tetrix apps/Games/tetrix.desktop
+Files: bin/tetrix apps/Games/tetrix.desktop pics/tetrix/*
 Priority: optional
 Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Arch: iPAQ
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Game: control falling blocks
  A game for the Opie environment.
diff --git a/noncore/games/wordgame/opie-wordgame.control b/noncore/games/wordgame/opie-wordgame.control
index 0e28d37..f7ead2c 100644
--- a/noncore/games/wordgame/opie-wordgame.control
+++ b/noncore/games/wordgame/opie-wordgame.control
@@ -1,10 +1,10 @@
-Files: bin/wordgame apps/Games/wordgame.desktop
+Files: bin/wordgame apps/Games/wordgame.desktop pics/wordgame
 Priority: optional
 Section: opie/games
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Crossword game
  A crossword game for the Opie environment.
  Play against the computer or human opponents.
diff --git a/noncore/multimedia/showimg/opie-showimg.control b/noncore/multimedia/showimg/opie-showimg.control
index a76aed8..ac16cd5 100644
--- a/noncore/multimedia/showimg/opie-showimg.control
+++ b/noncore/multimedia/showimg/opie-showimg.control
@@ -1,10 +1,10 @@
-Files: bin/showimg apps/Applications/showimg.desktop
+Files: bin/showimg apps/Applications/showimg.desktop pics/imageviewer
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Image Viewer
  The image viewer for the Opie environment. Supports
  Whichever formats are compiled into Qt/Embedded (eg. PNG).
diff --git a/noncore/tools/calculator/opie-calculator.control b/noncore/tools/calculator/opie-calculator.control
index c5d9584..a374b4c 100644
--- a/noncore/tools/calculator/opie-calculator.control
+++ b/noncore/tools/calculator/opie-calculator.control
@@ -1,10 +1,10 @@
-Files: bin/calculator apps/Applications/calculator.desktop etc/unit_conversion.dat
+Files: bin/calculator apps/Applications/calculator.desktop etc/unit_conversion.dat pics/calc
 Priority: optional
 Section: opie/applications
 Maintainer: Warwick Allison <warwick@trolltech.com>
 Architecture: arm
 Version: $QPE_VERSION-$SUB_VERSION
 Depends: opie-base ($QPE_VERSION)
 Description: Calculator
  A multi-function calculator for the Opie environment.
  Includes units conversion.