diff --git a/data/services/plasma.protocol b/data/services/plasma.protocol
index f8bd81219..fc4ccc209 100644
--- a/data/services/plasma.protocol
+++ b/data/services/plasma.protocol
@@ -27,6 +27,7 @@ Description[he]=פרוטוקול עבור הרכיבים של Plasma
 Description[hr]=Protokol za servise u Plasmi
 Description[hu]=Protokoll a Plazma-szolgáltatáshoz
 Description[ia]=un protocollo per servicios de Plasma
+Description[id]=Protokol untuk layanan Plasma
 Description[is]=Samskiptamáti fyrir Plasma-þjónustur
 Description[it]=Un protocollo per servizi plasma
 Description[ja]=Plasma サービスのためのプロトコル
diff --git a/data/servicetypes/plasma-service.desktop b/data/servicetypes/plasma-service.desktop
index 454722c77..fb5ea6148 100644
--- a/data/servicetypes/plasma-service.desktop
+++ b/data/servicetypes/plasma-service.desktop
@@ -24,6 +24,7 @@ Comment[he]=שירות של Plasma
 Comment[hr]=Servis u Plasmi
 Comment[hu]=Plazma-szolgáltatás
 Comment[ia]=Servicio de Plasma
+Comment[id]=Layanan Plasma
 Comment[is]=Plasma-þjónusta
 Comment[it]=Servizio plasma
 Comment[ja]=Plasma サービス
diff --git a/data/servicetypes/plasma-toolbox.desktop b/data/servicetypes/plasma-toolbox.desktop
index 612f32a88..812815fdf 100644
--- a/data/servicetypes/plasma-toolbox.desktop
+++ b/data/servicetypes/plasma-toolbox.desktop
@@ -24,6 +24,7 @@ Comment[he]=ארגז כלים של Plasma
 Comment[hr]=Plasma alatni okvir
 Comment[hu]=Plazma-eszközkészlet
 Comment[ia]=Instrumentario de Plasma
+Comment[id]=Kotak alat Plasma
 Comment[is]=Plasma verkfærasafn
 Comment[it]=Barra degli strumenti plasma
 Comment[ja]=Plasma ツールボックス
diff --git a/paintutils.cpp b/paintutils.cpp
index b1d2ec5aa..d2ef4d691 100644
--- a/paintutils.cpp
+++ b/paintutils.cpp
@@ -147,6 +147,7 @@ QPixmap texturedText(const QString &text, const QFont &font, Plasma::Svg *textur
     buffPainter.setCompositionMode(QPainter::CompositionMode_SourceOver);
     buffPainter.drawImage(QPoint(0,0), image);
     buffPainter.drawPixmap(QPoint(1,1), pixmap);
+    buffPainter.end();
     return ret;
 }
 
diff --git a/popupapplet.cpp b/popupapplet.cpp
index 26fe294da..5ecce7775 100644
--- a/popupapplet.cpp
+++ b/popupapplet.cpp
@@ -78,6 +78,7 @@ void PopupApplet::setPopupIcon(const QIcon &icon)
             d->icon = 0;
             setLayout(0);
             setAspectRatioMode(d->savedAspectRatio);
+            d->popupConstraintsEvent(FormFactorConstraint);
         }
 
         return;
diff --git a/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop b/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop
index 5488c7326..36a85ec8f 100644
--- a/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop
+++ b/tests/testcontainmentactionsplugin/plasma-containmentactions-test.desktop
@@ -22,6 +22,7 @@ Name[he]=בדיקה
 Name[hr]=Test
 Name[hu]=Teszt
 Name[ia]=Essayo
+Name[id]=Tes
 Name[is]=Prófun
 Name[it]=Prova
 Name[ja]=テスト
@@ -83,6 +84,7 @@ Comment[he]=תוסף דמה לבדיקה
 Comment[hr]=Lažan priključak za testiranje
 Comment[hu]=Üres bővítmény teszteléshez
 Comment[ia]=Un plugin vacue pro essayar
+Comment[id]=Plugin palsu untuk pengujian
 Comment[is]=Tilraunaíforrit fyrir prófanir
 Comment[it]=Una estensione fittizia di prova
 Comment[ja]=テスト用のダミープラグイン