diff --git a/rbutil/rbutilqt/configure.cpp b/rbutil/rbutilqt/configure.cpp
index 6d52fd0f2b..e92234527b 100644
--- a/rbutil/rbutilqt/configure.cpp
+++ b/rbutil/rbutilqt/configure.cpp
@@ -60,6 +60,15 @@ Config::Config(QWidget *parent) : QDialog(parent)
     connect(ui.buttonCancel, SIGNAL(clicked()), this, SLOT(abort()));
     connect(ui.radioNoProxy, SIGNAL(toggled(bool)), this, SLOT(setNoProxy(bool)));
     connect(ui.radioSystemProxy, SIGNAL(toggled(bool)), this, SLOT(setSystemProxy(bool)));
+
+    // disable unimplemented stuff
+    ui.buttonCacheBrowse->setEnabled(false);
+    ui.cacheDisable->setEnabled(false);
+    ui.cacheOfflineMode->setEnabled(false);
+    ui.buttonCacheClear->setEnabled(false);
+    ui.scrobblerUser->setEnabled(false);
+    ui.scrobblerPass->setEnabled(false);
+    ui.scrobblerTimezone->setEnabled(false);
 }
 
 
diff --git a/rbutil/rbutilqt/configurefrm.ui b/rbutil/rbutilqt/configurefrm.ui
index 4c0a3a3e2f..8310c71ae7 100644
--- a/rbutil/rbutilqt/configurefrm.ui
+++ b/rbutil/rbutilqt/configurefrm.ui
@@ -38,6 +38,9 @@
      <property name="text" >
       <string>&amp;Ok</string>
      </property>
+     <property name="icon" >
+      <iconset resource="rbutilqt.qrc" >:/icons/icons/go-next.png</iconset>
+     </property>
     </widget>
    </item>
    <item row="2" column="2" >
@@ -45,6 +48,9 @@
      <property name="text" >
       <string>&amp;Cancel</string>
      </property>
+     <property name="icon" >
+      <iconset resource="rbutilqt.qrc" >:/icons/icons/process-stop.png</iconset>
+     </property>
     </widget>
    </item>
    <item row="1" column="0" colspan="3" >
@@ -70,7 +76,7 @@
        <item row="1" column="0" >
         <widget class="QRadioButton" name="radioSystemProxy" >
          <property name="text" >
-          <string>Use &amp;System values</string>
+          <string>Use S&amp;ystem values</string>
          </property>
         </widget>
        </item>
@@ -121,7 +127,11 @@
            <widget class="QLineEdit" name="proxyUser" />
           </item>
           <item row="3" column="1" >
-           <widget class="QLineEdit" name="proxyPass" />
+           <widget class="QLineEdit" name="proxyPass" >
+            <property name="echoMode" >
+             <enum>QLineEdit::Password</enum>
+            </property>
+           </widget>
           </item>
           <item row="2" column="0" >
            <widget class="QLabel" name="label_3" >
@@ -136,7 +146,7 @@
           <item row="3" column="0" >
            <widget class="QLabel" name="label_4" >
             <property name="text" >
-             <string>P&amp;assword</string>
+             <string>Pass&amp;word</string>
             </property>
             <property name="buddy" >
              <cstring>proxyPass</cstring>
@@ -171,15 +181,180 @@
        </item>
       </layout>
      </widget>
+     <widget class="QWidget" name="tabCache" >
+      <attribute name="title" >
+       <string>C&amp;ache</string>
+      </attribute>
+      <attribute name="toolTip" >
+       <string>Download cache settings</string>
+      </attribute>
+      <layout class="QGridLayout" >
+       <item row="0" column="0" colspan="2" >
+        <widget class="QLabel" name="cacheDescription" >
+         <property name="text" >
+          <string>Rockbox Utility uses a local download cache to save network traffic. You can change the path to the cache and use it as local repository by enabling Offline mode.</string>
+         </property>
+         <property name="wordWrap" >
+          <bool>true</bool>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="0" >
+        <widget class="QLabel" name="cacheSize" >
+         <property name="text" >
+          <string>Current cache size is %1</string>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" colspan="2" >
+        <layout class="QHBoxLayout" >
+         <item>
+          <widget class="QLabel" name="label_5" >
+           <property name="text" >
+            <string>P&amp;ath</string>
+           </property>
+           <property name="buddy" >
+            <cstring>cachePath</cstring>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QLineEdit" name="cachePath" />
+         </item>
+         <item>
+          <widget class="QPushButton" name="buttonCacheBrowse" >
+           <property name="text" >
+            <string>&amp;Browse</string>
+           </property>
+           <property name="icon" >
+            <iconset resource="rbutilqt.qrc" >:/icons/icons/system-search.png</iconset>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="3" column="0" colspan="2" >
+        <layout class="QVBoxLayout" >
+         <item>
+          <widget class="QCheckBox" name="cacheDisable" >
+           <property name="text" >
+            <string>Disable local &amp;download cache</string>
+           </property>
+          </widget>
+         </item>
+         <item>
+          <widget class="QCheckBox" name="cacheOfflineMode" >
+           <property name="text" >
+            <string>O&amp;ffline mode</string>
+           </property>
+          </widget>
+         </item>
+        </layout>
+       </item>
+       <item row="4" column="1" >
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>20</width>
+           <height>61</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="5" column="0" >
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Horizontal</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>40</width>
+           <height>20</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+       <item row="5" column="1" >
+        <widget class="QPushButton" name="buttonCacheClear" >
+         <property name="text" >
+          <string>Clean cache &amp;now</string>
+         </property>
+        </widget>
+       </item>
+      </layout>
+     </widget>
      <widget class="QWidget" name="tabScrobbler" >
       <attribute name="title" >
        <string>&amp;Scrobbler</string>
       </attribute>
+      <layout class="QGridLayout" >
+       <item row="0" column="0" >
+        <widget class="QLabel" name="label_8" >
+         <property name="text" >
+          <string>&amp;Username</string>
+         </property>
+         <property name="buddy" >
+          <cstring>scrobblerUser</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="0" column="1" >
+        <widget class="QLineEdit" name="scrobblerUser" />
+       </item>
+       <item row="1" column="0" >
+        <widget class="QLabel" name="label_9" >
+         <property name="text" >
+          <string>P&amp;assword</string>
+         </property>
+         <property name="buddy" >
+          <cstring>scrobblerPass</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="1" column="1" >
+        <widget class="QLineEdit" name="scrobblerPass" >
+         <property name="echoMode" >
+          <enum>QLineEdit::Password</enum>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="0" >
+        <widget class="QLabel" name="label_10" >
+         <property name="text" >
+          <string>&amp;Timezone</string>
+         </property>
+         <property name="buddy" >
+          <cstring>scrobblerTimezone</cstring>
+         </property>
+        </widget>
+       </item>
+       <item row="2" column="1" >
+        <widget class="QComboBox" name="scrobblerTimezone" />
+       </item>
+       <item row="4" column="1" >
+        <spacer>
+         <property name="orientation" >
+          <enum>Qt::Vertical</enum>
+         </property>
+         <property name="sizeHint" >
+          <size>
+           <width>20</width>
+           <height>40</height>
+          </size>
+         </property>
+        </spacer>
+       </item>
+      </layout>
      </widget>
     </widget>
    </item>
   </layout>
  </widget>
- <resources/>
+ <resources>
+  <include location="rbutilqt.qrc" />
+ </resources>
  <connections/>
 </ui>
diff --git a/rbutil/rbutilqt/progressloggergui.cpp b/rbutil/rbutilqt/progressloggergui.cpp
index 8dc3e71844..932c18dfce 100644
--- a/rbutil/rbutilqt/progressloggergui.cpp
+++ b/rbutil/rbutilqt/progressloggergui.cpp
@@ -40,16 +40,16 @@ void ProgressLoggerGui::addItem(QString text,int flag)
     switch(flag)
     {
         case LOGOK:
-            item->setIcon(QIcon(":/icons/icons/log-ok.png"));
+            item->setIcon(QIcon(":/icons/icons/go-next.png"));
             break;
         case LOGINFO:
-            item->setIcon(QIcon(":/icons/icons/log-info.png"));
+            item->setIcon(QIcon(":/icons/icons/dialog-information.png"));
             break;
         case LOGWARNING:
-            item->setIcon(QIcon(":/icons/icons/log-warning.png"));
+            item->setIcon(QIcon(":/icons/icons/dialog-warning.png"));
             break;
         case LOGERROR:
-            item->setIcon(QIcon(":/icons/icons/log-error.png"));
+            item->setIcon(QIcon(":/icons/icons/dialog-error.png"));
             break;
     }
     
diff --git a/rbutil/rbutilqt/rbutilqt.qrc b/rbutil/rbutilqt/rbutilqt.qrc
index 913d600897..862d7df20c 100644
--- a/rbutil/rbutilqt/rbutilqt.qrc
+++ b/rbutil/rbutilqt/rbutilqt.qrc
@@ -5,17 +5,19 @@
     </qresource>
     <qresource prefix="/icons" >
         <file>icons/bootloader_btn.png</file>
+        <file>icons/dialog-error.png</file>
+        <file>icons/dialog-information.png</file>
+        <file>icons/dialog-warning.png</file>
         <file>icons/doom_btn.png</file>
         <file>icons/font_btn.png</file>
-        <file>icons/log-error.png</file>
-        <file>icons/log-info.png</file>
-        <file>icons/log-ok.png</file>
-        <file>icons/log-warning.png</file>
+        <file>icons/go-next.png</file>
+        <file>icons/process-stop.png</file>
         <file>icons/rbinstall_btn.png</file>
         <file>icons/rblogo.xpm</file>
         <file>icons/rbutil.xpm</file>
         <file>icons/rembootloader_btn.png</file>
         <file>icons/remrb_btn.png</file>
+        <file>icons/system-search.png</file>
         <file>icons/themes_btn.png</file>
         <file>icons/wizard.xpm</file>
     </qresource>