diff --git a/data/icons/16x16/apps/terminator.png b/data/icons/16x16/apps/terminator.png
index 9c649a40..43cbecff 100644
Binary files a/data/icons/16x16/apps/terminator.png and b/data/icons/16x16/apps/terminator.png differ
diff --git a/data/icons/22x22/apps/terminator.png b/data/icons/22x22/apps/terminator.png
index d5319a6b..18380298 100644
Binary files a/data/icons/22x22/apps/terminator.png and b/data/icons/22x22/apps/terminator.png differ
diff --git a/data/icons/24x24/apps/terminator.png b/data/icons/24x24/apps/terminator.png
index 81fc54fb..35294724 100644
Binary files a/data/icons/24x24/apps/terminator.png and b/data/icons/24x24/apps/terminator.png differ
diff --git a/data/icons/32x32/apps/terminator.png b/data/icons/32x32/apps/terminator.png
new file mode 100644
index 00000000..977bed70
Binary files /dev/null and b/data/icons/32x32/apps/terminator.png differ
diff --git a/data/icons/scalable/apps/terminator.svg b/data/icons/scalable/apps/terminator.svg
index f85b606c..d4039cc6 100644
--- a/data/icons/scalable/apps/terminator.svg
+++ b/data/icons/scalable/apps/terminator.svg
@@ -13,22 +13,14 @@
    height="48px"
    id="svg1306"
    sodipodi:version="0.32"
-   inkscape:version="0.46"
-   sodipodi:docbase="/home/jimmac/src/cvs/tango-icon-theme/scalable/apps"
-   sodipodi:docname="utilities-terminal.svg"
+   inkscape:version="0.46+devel"
+   sodipodi:docname="terminator.svg"
    inkscape:export-filename="/home/andreas/projekt/bild/tango/terminal4.png"
    inkscape:export-xdpi="240.00000"
    inkscape:export-ydpi="240.00000"
    inkscape:output_extension="org.inkscape.output.svg.inkscape">
   <defs
      id="defs1308">
-    <inkscape:perspective
-       sodipodi:type="inkscape:persp3d"
-       inkscape:vp_x="0 : 24 : 1"
-       inkscape:vp_y="0 : 1000 : 0"
-       inkscape:vp_z="48 : 24 : 1"
-       inkscape:persp3d-origin="24 : 16 : 1"
-       id="perspective79" />
     <radialGradient
        inkscape:collect="always"
        xlink:href="#linearGradient5060"
@@ -155,17 +147,6 @@
          offset="1"
          id="stop2242" />
     </linearGradient>
-    <linearGradient
-       id="linearGradient2224">
-      <stop
-         style="stop-color:#32342f;stop-opacity:0.54639173;"
-         offset="0.0000000"
-         id="stop2226" />
-      <stop
-         style="stop-color:#32342f;stop-opacity:0;"
-         offset="1"
-         id="stop2228" />
-    </linearGradient>
     <linearGradient
        id="linearGradient2214">
       <stop
@@ -229,17 +210,6 @@
        y2="32.497993"
        gradientUnits="userSpaceOnUse"
        gradientTransform="matrix(0.957412,0.000000,0.000000,0.952331,1.022766,0.133307)" />
-    <radialGradient
-       inkscape:collect="always"
-       xlink:href="#linearGradient2224"
-       id="radialGradient2230"
-       cx="24.041630"
-       cy="42.242130"
-       fx="24.041630"
-       fy="42.242130"
-       r="17.576654"
-       gradientTransform="matrix(1.000000,0.000000,0.000000,0.304598,-1.841788e-16,29.37527)"
-       gradientUnits="userSpaceOnUse" />
     <linearGradient
        inkscape:collect="always"
        xlink:href="#linearGradient2238"
@@ -290,7 +260,7 @@
      inkscape:pageopacity="0.0"
      inkscape:pageshadow="2"
      inkscape:zoom="1"
-     inkscape:cx="24.250101"
+     inkscape:cx="-127.7499"
      inkscape:cy="27.349621"
      inkscape:current-layer="layer1"
      showgrid="false"
@@ -299,7 +269,7 @@
      inkscape:window-width="1460"
      inkscape:window-height="1129"
      inkscape:window-x="321"
-     inkscape:window-y="50"
+     inkscape:window-y="42"
      showguides="true"
      inkscape:guide-bbox="true"
      inkscape:showpageshadow="false" />
@@ -311,26 +281,21 @@
         <dc:format>image/svg+xml</dc:format>
         <dc:type
            rdf:resource="http://purl.org/dc/dcmitype/StillImage" />
-        <dc:title>Terminal</dc:title>
-        <dc:date>2005-10-15</dc:date>
+        <dc:title></dc:title>
+        <dc:date></dc:date>
         <dc:creator>
           <cc:Agent>
-            <dc:title>Andreas Nilsson</dc:title>
+            <dc:title></dc:title>
           </cc:Agent>
         </dc:creator>
         <dc:subject>
-          <rdf:Bag>
-            <rdf:li>terminal</rdf:li>
-            <rdf:li>emulator</rdf:li>
-            <rdf:li>term</rdf:li>
-            <rdf:li>command line</rdf:li>
-          </rdf:Bag>
+          <rdf:Bag />
         </dc:subject>
         <cc:license
-           rdf:resource="http://creativecommons.org/licenses/by-sa/2.0/" />
+           rdf:resource="" />
         <dc:contributor>
           <cc:Agent>
-            <dc:title>Jakub Steiner</dc:title>
+            <dc:title></dc:title>
           </cc:Agent>
         </dc:contributor>
       </cc:Work>
diff --git a/debian/terminator.postinst b/debian/terminator.postinst
index 53e10bcb..530bfe13 100755
--- a/debian/terminator.postinst
+++ b/debian/terminator.postinst
@@ -2,6 +2,7 @@
 
 gtk-update-icon-cache -q -f /usr/share/icons/hicolor/
 pycentral pkginstall terminator
+update-menus
 
 #DEBHELPER#
 
diff --git a/setup.py b/setup.py
index 6222bc6f..73216be1 100755
--- a/setup.py
+++ b/setup.py
@@ -160,6 +160,7 @@ setup(name='Terminator',
                   ('share/icons/hicolor/16x16/apps', glob.glob('data/icons/16x16/apps/*.png')),
                   ('share/icons/hicolor/22x22/apps', glob.glob('data/icons/22x22/apps/*.png')),
                   ('share/icons/hicolor/24x24/apps', glob.glob('data/icons/24x24/apps/*.png')),
+                  ('share/icons/hicolor/24x24/apps', glob.glob('data/icons/32x32/apps/*.png')),
                   ('share/icons/hicolor/48x48/apps', glob.glob('data/icons/48x48/apps/*.png')),
                   ('share/icons/hicolor/16x16/actions', glob.glob('data/icons/16x16/actions/*.png')),
                  ],
diff --git a/terminatorlib/terminator.py b/terminatorlib/terminator.py
index 5618404d..c4ff1702 100755
--- a/terminatorlib/terminator.py
+++ b/terminatorlib/terminator.py
@@ -1118,7 +1118,12 @@ class Terminator:
   def previous_tab(self, term):
     notebook = self.get_first_parent_notebook(term)
     if notebook:
-      notebook.prev_page()
+      cur = notebook.get_current_page()
+      pages = notebook.get_n_pages()
+      if cur == 0:
+        notebook.set_current_page(pages - 1)
+      else:
+        notebook.prev_page()
       # This seems to be required in some versions of (py)gtk.
       # Without it, the selection changes, but the displayed page doesn't change
       # Seen in gtk-2.12.11 and pygtk-2.12.1 at least.
@@ -1127,7 +1132,12 @@ class Terminator:
   def next_tab(self, term):
     notebook = self.get_first_parent_notebook(term)
     if notebook:
-      notebook.next_page()
+      cur = notebook.get_current_page()
+      pages = notebook.get_n_pages()
+      if cur == pages - 1:
+        notebook.set_current_page(0)
+      else:
+        notebook.next_page()
       notebook.set_current_page(notebook.get_current_page())
 
   def move_tab(self, term, direction):